262 files changed, 42106 insertions, 37636 deletions

diff --git a/AUTHORS b/AUTHORS
index dbd05d1..98909d5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -89,6 +89,9 @@ Mike Sweet		<mike@easysw.com>
 Peter Missel		<peter.missel@eplus-online.de>
 	Canon driver
 
+Piotr Stachura          <albert1@autocom.pl>
+	Canon PIXMA iP4200 support
+
 Richard Wisenoecker	<Richard.Wisenoecker@gmx.at>
 	Lexmark driver
 
diff --git a/ChangeLog b/ChangeLog
index a51e7c0..c13a216 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,296 @@
+2008-01-02	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.105.2.6) (+4 -4)
+
+	Don't print the command line options on a single line in the debug
+	output; it causes OS X 10.2 to fail.
+
+2007-12-31	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.105.2.5) (+129 -105)
+
+	Improve debugging output
+
+2007-12-31	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.305.6.16) (+16 -7)
+
+	Re-prep for 5.0.2.
+
+2007-12-31	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.305.6.15) (+11 -7)
+		src/main/buffer-image.c (1.1.2.3) (+3 -0)
+		src/testpattern/run-testpattern-2.in (1.2.4.4) (+32 -6)
+		src/testpattern/testpattern.c (1.44.8.2) (+120 -8)
+
+	[ 1844169 ] Severe per-page memory leak w/Canon driver, DuplexNoTumble
+
+	Test multi-page documents with duplex and tumble.
+
+	Fix data generation problems in test pattern generator.
+
+2007-12-30	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-driver.c (1.30.6.3) (+2 -2)
+
+	Fix compile problem on OS X.
+
+2007-12-29	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.305.6.14) (+3 -4)
+
+	Prep for 5.0.2.
+
+2007-12-29	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.305.6.13) (+4 -4)
+		README (1.165.6.5) (+16 -16)
+		configure.ac (1.151.2.5) (+4 -4)
+
+	Bump version
+
+2007-12-29	<rlk@sourceforge.net>
+
+	Files:	AUTHORS (1.21.10.3) (+3 -0)
+		Makefile.am (1.146.2.2) (+35 -35)
+		NEWS (1.305.6.12) (+42 -12)
+		src/cups/cups-genppdupdate.in (1.25.8.4) (+30 -26)
+		src/cups/rastertoprinter.c (1.105.2.4) (+12 -6)
+		src/escputil/d4lib.c (1.7.8.1) (+2 -2)
+		src/escputil/escputil.c (1.87.8.3) (+26 -18)
+		src/foomatic/foomatic-printermap (1.122.4.5) (+9 -0)
+		src/main/canon-inks.h (1.6.4.4) (+15 -0)
+		src/main/canon-modes.h (1.8.4.4) (+51 -2)
+		src/main/canon-printers.h (1.13.4.5) (+98 -5)
+		src/main/escp2-channels.c (1.62.8.3) (+269 -105)
+		src/main/escp2-driver.c (1.30.6.2) (+71 -25)
+		src/main/escp2-inks.c (1.46.10.3) (+29 -1)
+		src/main/escp2-papers.c (1.99.8.3) (+92 -1)
+		src/main/print-canon.c (1.190.2.5) (+69 -39)
+		src/main/print-escp2-data.c (1.202.6.4) (+114 -88)
+		src/main/print-escp2.c (1.355.2.4) (+65 -4)
+		src/main/print-escp2.h (1.105.6.4) (+16 -5)
+		src/main/print-olympus.c (1.61.2.3) (+2 -2)
+		src/main/printers.xml (1.157.4.8) (+17 -3)
+		src/testpattern/run-testpattern-2.in (1.2.4.3) (+20 -8)
+
+	Merge relevant 5.1.5 changes
+
+2007-12-24	<rlk@sourceforge.net>
+
+	Files:	src/main/mark.c (1.5) (removed)
+		src/main/page.c (1.4) (removed)
+		src/main/ppd.c (1.6) (removed)
+		src/main/ppd.h (1.5) (removed)
+		src/main/xmlppd.c (1.2) (+3 -3)
+		src/main/xmlppd.h (1.2) (+2 -2)
+
+	Replace Postscript PPD back end with XML-based one that's GPL2+.
+
+2007-12-24	<rlk@sourceforge.net>
+
+	Files:	src/main/xmlppd.c (1.1) (added)
+		src/main/xmlppd.h (1.1) (added)
+
+	First checkin of replacement PPD code (compiles, does not run successfully)
+
+2007-12-23	<easysw@sourceforge.net>
+
+	Files:	src/cups/command.types (1.1.78.1) (+13 -21)
+		src/cups/commandtoepson.c (1.2.68.1) (+13 -21)
+		src/cups/cups-calibrate.c (1.5.18.1) (+11 -19)
+		src/cups/epson.c (1.7.8.2) (+13 -21)
+		src/cups/genppd.c (1.119.2.5) (+12 -20)
+		src/cups/rastertoprinter.c (1.105.2.3) (+12 -20)
+
+	Update copyright notice.
+
+2007-12-16	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.38.4.4) (+1373 -1237)
+		po/da.po (1.73.4.4) (+1383 -1234)
+		po/de.po (1.51.4.4) (+1380 -1252)
+		po/el.po (1.52.4.4) (+1372 -1237)
+		po/en_GB.po (1.144.4.4) (+1383 -1234)
+		po/es.po (1.50.4.4) (+1373 -1237)
+		po/fr.po (1.76.4.5) (+1383 -1234)
+		po/hu.po (1.9.4.4) (+1381 -1233)
+		po/ja.po (1.46.4.4) (+1373 -1237)
+		po/nb.po (1.13.4.4) (+1372 -1236)
+		po/nl.po (1.52.4.6) (+1383 -1234)
+		po/pl.po (1.56.4.4) (+1372 -1237)
+		po/pt.po (1.51.4.4) (+1373 -1237)
+		po/sk.po (1.55.4.4) (+1373 -1237)
+		po/sv.po (1.83.4.4) (+1384 -1238)
+		po/zh_TW.po (1.12.4.4) (+1380 -1236)
+
+	Gutenprint 5.0.1-beta2 release
+
+2007-12-16	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.305.6.11) (+1 -1)
+
+	Try again...
+
+2007-12-16	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.305.6.10) (+2 -2)
+
+	Prep for 5.0.2-beta1.
+
+2007-12-16	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.151.2.4) (+8 -5)
+
+	Add AM_PROG_CC_C_O and improve some messages.
+
+2007-12-16	<rlk@sourceforge.net>
+
+	Files:	README (1.165.6.4) (+4 -5)
+
+	Use configuration summary from the actual release.
+
+2007-12-15	<rlk@sourceforge.net>
+
+	Files:	Makefile.am (1.146.2.1) (+3 -3)
+		NEWS (1.305.6.9) (+118 -30)
+		README (1.165.6.3) (+81 -78)
+		configure.ac (1.151.2.3) (+9 -5)
+		include/gutenprint/printers.h (1.3.8.1) (+15 -2)
+		include/gutenprint/util.h (1.3.2.2) (+3 -2)
+		src/cups/Makefile.am (1.87.8.3) (+4 -3)
+		src/cups/cups-genppdupdate.in (1.25.8.3) (+77 -16)
+		src/cups/genppd.c (1.119.2.4) (+81 -20)
+		src/cups/rastertoprinter.c (1.105.2.2) (+192 -103)
+		src/cups/test-ppds (1.2.8.1) (+16 -52)
+		src/cups/test-rastertogutenprint.in (1.3.2.2) (+103 -0)
+		src/escputil/escputil.c (1.87.8.2) (+74 -78)
+		src/foomatic/foomatic-printermap (1.122.4.4) (+27 -0)
+		src/ghost/ijsgutenprint.c (1.18.8.1) (+3 -3)
+		src/gutenprintui/panel.c (1.9.6.2) (+71 -1)
+		src/gutenprintui/plist.c (1.3.6.2) (+34 -7)
+		src/gutenprintui2/panel.c (1.11.8.3) (+71 -1)
+		src/gutenprintui2/plist.c (1.6.10.4) (+37 -8)
+		src/main/canon-inks.h (1.6.4.3) (+111 -2)
+		src/main/canon-media.h (1.4.4.4) (+24 -30)
+		src/main/canon-modes.h (1.8.4.3) (+87 -59)
+		src/main/canon-printers.h (1.13.4.4) (+109 -42)
+		src/main/dither-impl.h (1.25.18.1) (+2 -2)
+		src/main/dither-main.c (1.52.8.1) (+1 -1)
+		src/main/dither-ordered.c (1.17.18.1) (+1 -1)
+		src/main/escp2-resolutions.c (1.33.8.3) (+5 -5)
+		src/main/papers.xml (1.21.8.2) (+3 -3)
+		src/main/print-canon.c (1.190.2.4) (+79 -28)
+		src/main/print-color.c (1.135.8.2) (+2 -2)
+		src/main/print-escp2-data.c (1.202.6.3) (+2 -2)
+		src/main/print-escp2.c (1.355.2.3) (+32 -16)
+		src/main/print-escp2.h (1.105.6.3) (+3 -2)
+		src/main/print-lexmark.c (1.154.8.1) (+2 -1)
+		src/main/print-olympus.c (1.61.2.2) (+254 -110)
+		src/main/print-pcl.c (1.145.2.1) (+2 -3)
+		src/main/print-ps.c (1.87.8.2) (+2 -1)
+		src/main/print-raw.c (1.38.8.1) (+2 -1)
+		src/main/print-util.c (1.109.4.4) (+14 -6)
+		src/main/printers.c (1.79.2.2) (+12 -1)
+		src/main/printers.xml (1.157.4.7) (+88 -48)
+		src/main/sequence.c (1.23.2.1) (+24 -5)
+		src/testpattern/Makefile.am (1.25.8.1) (+4 -2)
+		src/testpattern/run-testpattern (1.20.10.1) (+25 -7)
+		src/testpattern/run-testpattern-1 (1.6.10.1) (+37 -14)
+		src/testpattern/run-testpattern-2.in (1.2.4.2) (+70 -24)
+		src/testpattern/testpattern.c (1.44.8.1) (+47 -2)
+		src/testpattern/testpattern.h (1.15.18.1) (+3 -1)
+		src/testpattern/testpatternl.l (1.17.14.1) (+2 -1)
+		src/testpattern/testpatterny.y (1.26.18.3) (+21 -2)
+		test/pixma_parse.c (1.8.2.4) (+21 -7)
+		test/run-testdither (1.11.8.1) (+2 -2)
+
+	Merge from 5.1.3 to 5.1.4; bump version
+
+2007-12-13	<rlk@sourceforge.net>
+
+	Files:	src/main/mark.c (1.4) (+17 -15)
+		src/main/page.c (1.3) (+17 -15)
+		src/main/ppd.c (1.5) (+17 -22)
+		src/main/ppd.h (1.4) (+17 -22)
+
+	[ 1848308 ] LICENSE.txt file missing
+
+2007-12-12	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-rastertogutenprint.in (1.3.2.1) (removed)
+
+	file test-rastertogutenprint.in was added on branch gutenprint-5_0-branch on 2007-12-15 20:35:37 +0000
+
+2007-12-12	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-rastertogutenprint.in (1.3) (+3 -6)
+
+	Select pages from user manual rather than using saved PDF.
+
+2007-12-11	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-rastertogutenprint.in (1.2) (+8 -4)
+
+	Try to make it work on OS X.
+
+2007-12-11	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-rastertogutenprint.in (1.1) (added)
+
+	Add test for CUPS driver
+
+2007-12-02	<rlk@sourceforge.net>
+
+	Files:	po/fr.po (1.76.4.4) (+6 -6)
+
+	Fix some PPD issues.
+
+2007-12-02	<rlk@sourceforge.net>
+
+	Files:	po/nl.po (1.52.4.5) (+6 -6)
+
+	Fix up a few PPD-related problems.
+
+2007-12-02	<rlk@sourceforge.net>
+
+	Files:	src/gutenprintui/Makefile.am (1.5.10.1) (+3 -1)
+		src/gutenprintui2/Makefile.am (1.6.10.1) (+3 -1)
+		src/main/gutenprint.pc.in (1.2.10.1) (+1 -1)
+
+	Packaging fix from Greg Troxel
+
+2007-09-09	<rlk@sourceforge.net>
+
+	Files:	src/main/mark.c (1.3) (+3 -3)
+		src/main/ppd.c (1.4) (+80 -47)
+		src/main/ppd.h (1.3) (+14 -2)
+
+	Use Gutenprint option data where available rather than PPD file
+	enumerations.
+
+2007-06-17	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.38.4.3) (+1571 -1379)
+		po/da.po (1.73.4.3) (+1579 -1378)
+		po/de.po (1.51.4.3) (+1545 -1369)
+		po/el.po (1.52.4.3) (+1574 -1382)
+		po/en_GB.po (1.144.4.3) (+1579 -1378)
+		po/es.po (1.50.4.3) (+1571 -1379)
+		po/fr.po (1.76.4.3) (+1581 -1380)
+		po/hu.po (1.9.4.3) (+1579 -1378)
+		po/ja.po (1.46.4.3) (+1571 -1379)
+		po/nb.po (1.13.4.3) (+1571 -1379)
+		po/nl.po (1.52.4.4) (+1579 -1378)
+		po/pl.po (1.56.4.3) (+1569 -1377)
+		po/pt.po (1.51.4.3) (+1571 -1379)
+		po/sk.po (1.55.4.3) (+1571 -1379)
+		po/sv.po (1.83.4.3) (+1580 -1379)
+		po/zh_TW.po (1.12.4.3) (+1573 -1375)
+
+	Gutenprint 5.0.1 release
+
 2007-06-17	<rlk@sourceforge.net>
 
 	Files:	doc/gutenprint.dox.in (1.4.18.1) (+263 -84)
@@ -792,6 +1085,49 @@
 
 	file canon-modes.h was initially added on branch canon_experimental.
 
+2006-08-28	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.175.2.4) (+311 -1062)
+
+	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
+	- 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
+	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.
+
+2006-08-26	<m0m@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.59.2.3) (+126 -135)
+
+	change:
+	- a lot of stuff moved from olympus_do_print into sub routine
+	  olumpus_print_row
+	- simplified out_channels -> ink_channels conversion and 16bit -> 8 bit
+	  conversion
+
 2006-08-25	<faust3@sourceforge.net>
 
 	Files:	src/testpattern/run-testpattern-2.in (1.1.4.1) (+29 -16)
@@ -800,6 +1136,12 @@
 
 2006-08-24	<m0m@sourceforge.net>
 
+	Files:	src/main/print-olympus.c (1.59.2.2) (+1 -50)
+
+	- clean up all remains of olympus_get_cached_output code
+
+2006-08-24	<m0m@sourceforge.net>
+
 	Files:	src/main/print-olympus.c (1.59.2.1) (+76 -1)
 
 	changes:
@@ -5770,6 +6112,7 @@
 
 	Files:	src/main/print-escp2.c (1.322.2.1) (+3 -3)
 		src/main/print-olympus.c (1.50.2.1) (+3 -3)
+		src/main/print-pcl.c (1.134.2.1) (+3 -3)
 
 	Intermediate state
 
@@ -7500,6 +7843,14 @@
 	still running, but thus far nothing has shown up.  However, further
 	testing will still be required, particularly on the IJS driver.
 
+2004-03-28	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.79.2.4) (+22 -6)
+
+	Support color-only printers.
+
+	Log page percentage correctly.
+
 2004-03-28	<rleigh@sourceforge.net>
 
 	Files:	configure.ac (1.96) (+10 -3)
@@ -7514,6 +7865,7 @@
 2004-03-28	<rlk@sourceforge.net>
 
 	Files:	src/cups/genppd.c (1.89.2.2) (+15 -5)
+		src/cups/rastertoprinter.c (1.79.2.3) (+14 -3)
 
 	Add KCMY, inverted grayscale, and CMY color spaces.
 
@@ -7522,6 +7874,7 @@
 2004-03-26	<rlk@sourceforge.net>
 
 	Files:	src/cups/genppd.c (1.89.2.1) (+31 -16)
+		src/cups/rastertoprinter.c (1.79.2.2) (+29 -94)
 
 	Intermediate state, lots of things compile, genppd works
 
@@ -7689,6 +8042,19 @@
 
 	Put int and float values in the options list.
 
+2004-03-11	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.140.2.5) (+4 -4)
+
+	More intermediate state
+
+2004-03-09	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.140.2.4) (+7 -1)
+		src/main/print-escp2.c (1.308.2.4) (+36 -1)
+
+	Make all of the core parameters be string choices
+
 2004-03-03	<davehill@sourceforge.net>
 
 	Files:	NEWS (1.157) (+1 -0)
@@ -7711,7 +8077,15 @@
 
 2004-03-01	<rlk@sourceforge.net>
 
+	Files:	src/main/sequence.c (1.11.2.1) (+12 -7)
+
+	Clean up some const noise
+
+2004-03-01	<rlk@sourceforge.net>
+
 	Files:	src/main/print-canon.c (1.140.2.3) (+23 -9)
+		src/main/print-escp2.c (1.308.2.3) (+30 -10)
+		src/main/printers.c (1.61.2.2) (+54 -30)
 
 	Intermediate state
 
@@ -10406,7 +10780,9 @@
 	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/print-pcl.c (1.118.2.1) (+8 -6)
 		src/main/printers.c (1.59.2.1) (+3 -9)
+		src/main/sequence.c (1.9.2.1) (+2 -2)
 
 	Some new color stuff
 
@@ -11097,6 +11473,12 @@
 
 2003-06-19	<rlk@sourceforge.net>
 
+	Files:	src/main/printers.c (1.55.2.2) (+6 -6)
+
+	Everything now compiles
+
+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
@@ -11134,6 +11516,7 @@
 2003-06-19	<rlk@sourceforge.net>
 
 	Files:	src/main/printers.c (1.55.2.1) (+69 -64)
+		src/main/sequence.c (1.7.2.1) (+19 -28)
 
 	Use mxml rather than libxml2 for XML parser
 
@@ -11993,10 +12376,30 @@
 
 2003-05-25	<rlk@sourceforge.net>
 
+	Files:	src/main/print-canon.c (1.120.2.4) (+127 -13)
+		src/main/print-escp2.c (1.259.2.4) (+146 -38)
+
+	A number of fixes
+
+2003-05-25	<rlk@sourceforge.net>
+
 	Files:	src/main/print-canon.c (1.120.2.3) (+12 -12)
+		src/main/print-olympus.c (1.2.2.3) (+3 -3)
 
 	Tested more things
 
+2003-05-24	<rlk@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.2.2.2) (+3 -3)
+
+	Fix raw printing
+
+2003-05-23	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.259.2.3) (+4 -2)
+
+	Runs, but not really tested and has some valgrind issues
+
 2003-05-23	<rlk@sourceforge.net>
 
 	Files:	po/cs.po (1.4) (+25 -66)
@@ -12101,6 +12504,7 @@
 
 	Files:	src/main/print-canon.c (1.120.2.1) (+4 -9)
 		src/main/print-escp2.c (1.259.2.1) (+6 -10)
+		src/main/print-pcl.c (1.104.2.1) (+4 -9)
 
 	Start work on new channel architecture
 
@@ -12406,7 +12810,14 @@
 
 2003-05-04	<rlk@sourceforge.net>
 
-	Files:	po/cs.po (1.1.4.1) (+3348 -0)
+	Files:	src/main/print-escp2.c (1.255.2.4) (+77 -54)
+
+	Start testing this mess
+
+2003-05-04	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.60.2.3) (+3 -3)
+		po/cs.po (1.1.4.1) (+3348 -0)
 
 	Add Czech translation
 
@@ -12422,6 +12833,12 @@
 
 	Bump the version number
 
+2003-05-03	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.255.2.3) (+463 -503)
+
+	More cleanup work
+
 2003-05-01	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.60.2.1) (+2 -3)
@@ -12439,6 +12856,7 @@
 	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)
+		src/main/sequence.c (1.5.2.1) (+52 -44)
 
 	Start another thorny phase of cleanup
 
@@ -13766,6 +14184,7 @@
 2003-02-09	<rlk@sourceforge.net>
 
 	Files:	src/main/print-canon.c (1.107.2.2) (+5 -3)
+		src/main/print-escp2.c (1.229.2.3) (+5 -3)
 
 	Able to enable and disable individual options
 
@@ -13785,6 +14204,7 @@
 
 	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/print-pcl.c (1.89.2.1) (+3 -3)
 		src/main/printers.c (1.38.2.1) (+9 -5)
 
 	Allow UI to turn options on and off.
@@ -13990,6 +14410,13 @@
 
 	Copy updated config.sub and config.guess to the correct location
 
+2003-01-24	<rleigh@sourceforge.net>
+
+	Files:	Makefile.am (1.120.2.2) (+2 -2)
+
+	Compute libgimpprint major version correctly
+	Copy updated config.sub and config.guess to the correct location
+
 2003-01-23	<rleigh@sourceforge.net>
 
 	Files:	debian/rules (1.45) (+2 -2)
@@ -14473,6 +14900,12 @@
 
 	New color code appears to work more or less correctly.
 
+2003-01-18	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.101.2.5) (+6 -1)
+
+	Works at least for Epson driver
+
 2003-01-18	<mtomlinson@sourceforge.net>
 
 	Files:	src/main/print-dither.c (1.116) (+15 -3)
@@ -14487,6 +14920,25 @@
 
 2003-01-18	<rlk@sourceforge.net>
 
+	Files:	src/main/print-canon.c (1.101.2.4) (+12 -12)
+
+	Get past coredumps
+
+2003-01-18	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.220.2.4) (+36 -24)
+
+	Intermediate
+
+2003-01-18	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.220.2.3) (+5 -5)
+		src/main/print-pcl.c (1.82.2.1) (+38 -49)
+
+	Compiles now
+
+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)
 
@@ -14546,6 +14998,7 @@
 	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)
+		src/main/print-pcl.c (1.81.2.1) (+9 -12)
 
 	Remove monochrome mode to simplify color modifications
 
@@ -15046,6 +15499,7 @@
 
 	Files:	src/main/print-canon.c (1.94.2.2) (+22 -20)
 		src/main/print-escp2.c (1.212.2.2) (+2 -2)
+		src/main/printers.c (1.17.2.2) (+1 -2)
 
 	More code changes
 
@@ -15127,6 +15581,7 @@
 
 	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/print-pcl.c (1.76.2.1) (+64 -2)
 		src/main/printers.c (1.17.2.1) (+9 -1)
 
 	Work in progress
@@ -15770,6 +16225,7 @@
 
 	Files:	src/main/print-canon.c (1.84.2.1) (+67 -262)
 		src/main/print-escp2.c (1.197.2.1) (+22 -48)
+		src/main/print-pcl.c (1.67.2.1) (+38 -162)
 
 	Use curves for HSL transformations
 
@@ -16584,6 +17040,7 @@
 
 	Files:	src/cups/rastertoprinter.c (1.29.2.1) (+71 -123)
 		src/main/print-canon.c (1.83.2.2) (+51 -132)
+		src/main/print-escp2.c (1.193.2.3) (+100 -158)
 
 	Revamp the API again, everything compiles, at least some things work
 
@@ -16654,6 +17111,8 @@
 	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)
+		src/main/print-pcl.c (1.61.2.1) (+74 -79)
+		src/main/printers.c (1.7.2.2) (+111 -79)
 
 	The core library now compiles
 
@@ -16966,6 +17425,12 @@
 
 2002-11-02	<rlk@sourceforge.net>
 
+	Files:	src/main/print-canon.c (1.71.2.5) (+12 -12)
+
+	631498 Canon driver does not support A3 page size for large format
+
+2002-11-02	<rlk@sourceforge.net>
+
 	Files:	src/main/print-canon.c (1.81) (+4 -4)
 
 	Fix some Canon page sizes.
@@ -17290,15 +17755,25 @@
 
 	Remove Ghostscript stp driver.
 
+2002-10-26	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.77.2.5) (+4 -4)
+
+	Fix some top/bottom confusion
+
 2002-10-24	<rlk@sourceforge.net>
 
 	Files:	src/cups/genppd.c (1.43.2.1) (+5 -5)
+		src/cups/rastertoprinter.c (1.25.2.3) (+4 -4)
+		src/main/print-canon.c (1.77.2.4) (+3 -1)
+		src/main/print-escp2.c (1.188.2.4) (+3 -1)
 
 	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)
+		src/cups/rastertoprinter.c (1.25.2.2) (+2 -3)
 
 	Remove the old-style Ghostscript stp driver
 
@@ -17306,6 +17781,7 @@
 
 	Files:	src/cups/rastertoprinter.c (1.25.2.1) (+4 -57)
 		src/main/print-canon.c (1.77.2.3) (+12 -4)
+		src/main/print-escp2.c (1.188.2.3) (+7 -13)
 
 	Clean up the API, still need to fix the GIMP plugin
 
@@ -17324,6 +17800,12 @@
 
 2002-10-21	<rlk@sourceforge.net>
 
+	Files:	src/main/printers.c (1.1.2.2) (+9 -67)
+
+	More reorganization/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.
@@ -17350,6 +17832,7 @@
 
 	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/print-pcl.c (1.56.2.1) (+7 -28)
 		src/main/printers.c (1.1.2.1) (+142 -0)
 
 	Start working on some reorganization
@@ -17427,6 +17910,12 @@
 
 	Add Japanese translation
 
+2002-10-13	<easysw@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.36.2.5) (+28 -50)
+
+	Mirror development branch changes by Robert in 4.2 branch.
+
 2002-10-13	<rlk@sourceforge.net>
 
 	Files:	src/cups/genppd.c (1.43) (+28 -50)
@@ -17440,6 +17929,13 @@
 	Mirror 4.2.x changes, although I am unable to test them do to configure
 	script problems...
 
+2002-10-13	<easysw@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.36.2.4) (+62 -5)
+
+	Preliminary fix for custom page size support - we still need to add an
+	API for getting the margins and limits of custom sizes.
+
 2002-10-12	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2-data.c (1.64) (+51 -3)
@@ -17996,6 +18492,14 @@
 
 	Allow specification of individual physical input channels
 
+2002-08-20	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.180.2.4) (+23 -10)
+
+	Coalesce some printers that are duplicates.
+
+	Support fast 360 DPI mode on 7-color Epson printers.
+
 2002-08-13	<rwisi@sourceforge.net>
 
 	Files:	src/main/print-lexmark.c (1.75) (+4 -6)
@@ -18045,12 +18549,25 @@
 	Make libgimpprint-doc a virtual package
 	Generate libgimpprint-doc.doc-base to cope with package naming changes
 
+2002-07-31	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.17.2.4) (+21 -9)
+
+	Still check for doc tools even if we're not in maintainer mode; just
+	don't warn if we don't find them.
+
 2002-07-26	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2-data.c (1.51) (+18 -7)
 
 	Fixes for STP 2100/2200
 
+2002-07-23	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.17.2.3) (+31 -29)
+
+	Don't check for the doc tools if maintainer mode isn't turned on.
+
 2002-07-22	<rleigh@sourceforge.net>
 
 	Files:	po/en_GB.po (1.86) (+50 -53)
@@ -18059,10 +18576,25 @@
 
 2002-07-22	<rlk@sourceforge.net>
 
-	Files:	test/unprint.c (1.22.8.1) (+16 -5)
+	Files:	src/testpattern/testpattern.c (1.6.8.1) (+64 -41)
+		test/unprint.c (1.22.8.1) (+16 -5)
 
 	Merge mainline into 4.2 branch
 
+2002-07-22	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.180.2.3) (+27 -16)
+
+	Support raw printing in color depths of 1, 2, 4, 6, and 7.  The
+	color depth of 2 is used on 7 color printers to print using the
+	two blacks.
+
+	In the Epson driver, don't show the pseudo-inksets that are used for
+	the raw printing, as these are of no use in normal printing.  Instead,
+	convert whatever inkset is specified to the appropriate pseudo-inkset
+	when raw printing is detected.  This is a much cleaner (and more
+	transparent) interface.
+
 2002-07-21	<rlk@sourceforge.net>
 
 	Files:	src/main/print-color.c (1.28) (+3 -2)
@@ -18105,6 +18637,7 @@
 	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)
+		src/main/print-pcl.c (1.54.2.1) (+5 -3)
 
 	Start working on n-color support
 
@@ -18657,6 +19190,18 @@
 
 2002-06-05	<rlk@sourceforge.net>
 
+	Files:	src/main/print-canon.c (1.71.2.4) (+4 -6)
+
+	Put _DEPENDENCIES back in Makefile.am; automake doesn't figure them out.
+
+	Fix vasprintf (565092)
+
+	Minor cleanup nit in print-canon.c
+
+	Prepare for 4.2.2-pre2.
+
+2002-06-05	<rlk@sourceforge.net>
+
 	Files:	src/testpattern/testpattern.c (1.7) (+64 -41)
 		src/testpattern/testpattern.h (1.3) (+38 -18)
 		src/testpattern/testpatternl.l (1.3) (+2 -1)
@@ -18725,6 +19270,7 @@
 2002-05-25	<sharkey@sourceforge.net>
 
 	Files:	po/es.po (1.1.4.1) (+857 -647)
+		src/cups/rastertoprinter.c (1.8.2.5) (+8 -3)
 		src/main/print-escp2-data.c (1.15.6.1) (+1 -1)
 		src/main/print-escp2.h (1.7.6.1) (+1 -1)
 
@@ -18756,6 +19302,14 @@
 
 2002-05-18	<rleigh@sourceforge.net>
 
+	Files:	Makefile.am (1.120.2.1) (+3 -2)
+
+	Update packaging to debhelper v4
+	Versioned library development and documentation packages
+	Update package descriptions
+
+2002-05-18	<rleigh@sourceforge.net>
+
 	Files:	Makefile.am (1.129) (+3 -2)
 		debian/changelog (1.47) (+2 -1)
 		debian/compat (1.1) (added)
@@ -19791,6 +20345,12 @@
 
 2002-03-17	<rlk@sourceforge.net>
 
+	Files:	src/main/print-escp2.c (1.147.2.4) (+16 -10)
+
+	Improve pigment Stylus Pro print quality
+
+2002-03-17	<rlk@sourceforge.net>
+
 	Files:	src/main/printers.xml (1.44) (+4 -1)
 
 	Tune the pigment Stylus Pro printers
@@ -20228,6 +20788,12 @@
 
 2002-01-30	<rlk@sourceforge.net>
 
+	Files:	src/main/print-escp2.c (1.147.2.3) (+8 -8)
+
+	Allow smaller paper sizes on Stylus Pro printers
+
+2002-01-30	<rlk@sourceforge.net>
+
 	Files:	scripts/mkchlog (1.5) (+2 -1)
 
 	A few more tweaks
@@ -21011,6 +21577,12 @@
 
 	Rebuild Foomatic database if the printermap changes.  Reviewed by Till.
 
+2001-11-18	<sharkey@sourceforge.net>
+
+	Files:	src/main/printers.xml (1.9.4.8) (+18 -4)
+
+	Update debian branch to RC1 and prep for Debian upload.
+
 2001-11-18	<rlk@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-printermap (1.22) (+1 -1)
@@ -21599,6 +22171,12 @@
 
 	Added <pubdate> so that the date would actually appear in ps and pdf output.
 
+2001-10-27	<sharkey@sourceforge.net>
+
+	Files:	src/main/printers.xml (1.9.4.7) (+95 -4)
+
+	Sync debian branch with b4.
+
 2001-10-27	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.139) (+2 -2)
@@ -23106,7 +23684,9 @@
 
 2001-09-14	<sharkey@sourceforge.net>
 
-	Files:	src/main/printers.xml (1.9.4.6) (+33 -5)
+	Files:	src/cups/genppd.c (1.7.2.5) (+165 -272)
+		src/cups/rastertoprinter.c (1.8.2.4) (+20 -48)
+		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.
@@ -24347,7 +24927,9 @@
 
 2001-07-23	<sharkey@sourceforge.net>
 
-	Files:	src/main/printers.xml (1.9.4.5) (+56 -2)
+	Files:	src/cups/genppd.c (1.7.2.4) (+398 -181)
+		src/cups/rastertoprinter.c (1.8.2.3) (+227 -47)
+		src/main/printers.xml (1.9.4.5) (+56 -2)
 
 	Merge in alpha 2 from the mainline.
 
@@ -25078,7 +25660,10 @@
 
 2001-06-30	<sharkey@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.7.2.3) (+84 -97)
+	Files:	po/en_GB.po (1.3.4.4) (+546 -378)
+		src/cups/genppd.c (1.7.2.3) (+84 -97)
+		src/main/print-escp2.c (1.24.2.4) (+803 -337)
+		src/main/print-util.c (1.8.4.4) (+189 -74)
 		src/main/printers.xml (1.9.4.3) (+50 -0)
 
 	Merge in 4.1.10 for the 4.1.10-1 debian release.
@@ -25680,6 +26265,7 @@
 2001-05-28	<rlk@sourceforge.net>
 
 	Files:	src/main/print-canon.c (1.43.2.2) (+7 -1)
+		src/main/print-pcl.c (1.28.2.1) (+7 -1)
 
 	Verify in the drivers that the parameters have been checked prior to
 	attempting to print.
@@ -25709,6 +26295,20 @@
 	The Gimp plugin now grays out page width & height boxes when they
 	can't be modified.
 
+2001-05-26	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.68.2.4) (+23 -1)
+
+	Add additional microweave modes.
+
+	Add ID string to printers.xml.
+
+2001-05-25	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.68.2.3) (+2 -2)
+
+	Set the dot sizes correctly (per the manual) on Stylus Pro printers.
+
 2001-05-25	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.68.2.2) (+13 -7)
@@ -25935,7 +26535,10 @@
 
 2001-05-09	<sharkey@sourceforge.net>
 
-	Files:	src/cups/genppd.c (1.7.2.2) (+49 -16)
+	Files:	po/en_GB.po (1.3.4.3) (+381 -443)
+		src/cups/genppd.c (1.7.2.2) (+49 -16)
+		src/cups/rastertoprinter.c (1.8.2.2) (+29 -2)
+		src/main/print-escp2.c (1.24.2.3) (+667 -660)
 		src/main/print-util.c (1.8.4.3) (+207 -7)
 
 	Merge 4.1.7, prepare for 4.1.7-1 debs.
@@ -26620,6 +27223,7 @@
 
 	Files:	src/main/print-canon.c (1.29.2.1) (+2 -1)
 		src/main/print-escp2.c (1.42.2.1) (+2 -1)
+		src/main/print-pcl.c (1.16.2.1) (+2 -1)
 
 	Let's try again with CMY(K)...
 
@@ -26703,6 +27307,12 @@
 
 2001-03-24	<rlk@sourceforge.net>
 
+	Files:	src/main/print-escp2.c (1.37.2.4) (+2 -2)
+
+	Intermediate state
+
+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)
@@ -26857,7 +27467,10 @@
 
 2001-03-10	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.18.2.1) (+348 -288)
+	Files:	Makefile.am (1.91.2.1) (+23 -10)
+		src/main/print-canon.c (1.18.2.1) (+348 -288)
+		src/main/print-escp2.c (1.37.2.3) (+13 -13)
+		src/main/print-pcl.c (1.13.2.1) (+17 -17)
 
 	Intermediate merge up with mainline
 
@@ -27374,6 +27987,13 @@
 
 	Fix the page dimensions of some older Epson printers.
 
+2001-02-23	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.9.2.5) (+4 -4)
+		src/main/print-canon.c (1.10.2.4) (+2 -1)
+
+	Make verify function be printer-specific.
+
 2001-02-22	<sharkey@sourceforge.net>
 
 	Files:	debian/.cvsignore (1.3) (removed)
@@ -27412,6 +28032,18 @@
 
 	Remove Debian specific files from the main trunk.
 
+2001-02-22	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.25.2.4) (+2 -2)
+
+	Some tuning for Epson matte paper
+
+2001-02-21	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.9.2.4) (+3 -3)
+
+	Fix up the new version of the Gimp plugin; clean up a few other things.
+
 2001-02-21	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.90) (+15 -2)
@@ -27431,13 +28063,16 @@
 
 2001-02-21	<rlk@sourceforge.net>
 
-	Files:	src/main/print-canon.c (1.10.2.3) (+16 -14)
+	Files:	src/cups/rastertoprinter.c (1.9.2.3) (+4 -4)
+		src/main/print-canon.c (1.10.2.3) (+16 -14)
+		src/main/print-escp2.c (1.25.2.3) (+10 -9)
 
 	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/cups/rastertoprinter.c (1.9.2.2) (+7 -7)
 		src/main/print-canon.c (1.10.2.2) (+12 -12)
 		src/main/print-escp2.c (1.25.2.2) (+48 -39)
 
@@ -27468,6 +28103,7 @@
 
 	Files:	src/main/print-canon.c (1.10.2.1) (+54 -52)
 		src/main/print-escp2.c (1.25.2.1) (+132 -133)
+		src/main/print-pcl.c (1.8.2.1) (+45 -44)
 
 	New print variable setup, on temporary branch
 
@@ -30063,9 +30699,15 @@
 
 2000-10-31	<rlk@sourceforge.net>
 
+	Files:	Makefile.am (1.70.2.2) (+5 -1)
+		configure.in (1.38) (+7 -1)
+
+	escputil man page
+
+2000-10-31	<rlk@sourceforge.net>
+
 	Files:	.cvsignore (1.10) (+1 -0)
 		Makefile.am (1.72) (+3 -0)
-		configure.in (1.38) (+7 -1)
 
 	escputil man page
 
@@ -30092,6 +30734,15 @@
 
 	Bring over a few fixes from 4.0+
 
+2000-10-29	<rlk@sourceforge.net>
+
+	Files:	Makefile.am (1.70.2.1) (+1 -1)
+
+	119667 INSTALL file is out of date
+	119668 escputil will not compile on non-GNU system
+	119669 escputil in Ghostscript in 4.0.0 is obsolete.
+	Bump version.
+
 2000-10-23	<davehill@sourceforge.net>
 
 	Files:	print-pcl.c (1.89) (+45 -6)
@@ -32487,6 +33138,12 @@
 
 	Attempt to function on systems without GNU getopt.
 
+2000-08-03	<rlk@sourceforge.net>
+
+	Files:	Makefile.am (1.44.2.1) (+1 -1)
+
+	Make stp driver work for all supported printers, not just Epson
+
 2000-08-02	<davehill@sourceforge.net>
 
 	Files:	pcl-unprint.c (1.15) (+14 -7)
@@ -33569,6 +34226,12 @@
 
 	Handle -r1440x720 correctly.
 
+2000-06-17	<jmv@sourceforge.net>
+
+	Files:	Makefile.am (1.36.2.1) (+2 -1)
+
+	Branch cleanup
+
 2000-06-17	<iay@sourceforge.net>
 
 	Files:	README.escp2 (1.3) (+92 -8)
diff --git a/INSTALL b/INSTALL
index 23e5f25..5458714 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@ unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
 
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +26,9 @@ debugging `configure').
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -78,7 +78,7 @@ details on some of the pertinent environment variables.
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
@@ -87,17 +87,15 @@ Compiling For Multiple Architectures
 
 You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
 
 Installation Names
 ==================
@@ -190,12 +188,12 @@ them in the `configure' command line, using `VAR=value'.  For example:
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
diff --git a/Makefile.am b/Makefile.am
index d359984..01b5b4f 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.146 2006/09/14 13:35:45 easysw Exp $
+## $Id: Makefile.am,v 1.146.2.2 2007/12/29 20:42:25 rlk Exp $
 ## Copyright (C) 2000-2004 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -45,14 +45,14 @@ libtool: $(LIBTOOL_DEPS)
 ChangeLogPhony:
 	@cd $(top_srcdir) ; \
 	for f in `find . -name Entries -print | grep CVS` ; do \
-	  if /usr/bin/test ! -f ChangeLogStamp -o ChangeLogStamp -ot $$f ; then \
+	  if @TEST@ ! -f ChangeLogStamp -o ChangeLogStamp -ot $$f ; then \
 	    rm -f ChangeLogStamp ; \
 	    touch ChangeLogStamp ; \
 	  fi ; \
 	done
 
 ChangeLogStamp: ChangeLogPhony
-	@/bin/true
+	@@TRUE@
 
 ChangeLog: ChangeLogStamp
 	@cd $(top_srcdir) ; \
@@ -141,41 +141,41 @@ snapshot:
 ## Clean
 
 CLEANSCRIPTS = \
-	depcomp \
-	install-sh \
-	ltconfig \
-	mdate-sh \
-	missing \
-	mkinstalldirs
+	scripts/depcomp \
+	scripts/install-sh \
+	scripts/ltconfig \
+	scripts/mdate-sh \
+	scripts/missing \
+	scripts/mkinstalldirs
 
 CLEANMFOUR = \
-	codeset.m4 \
-	gettext.m4 \
-	glibc21.m4 \
-	iconv.m4 \
-	intdiv0.m4 \
-	inttypes_h.m4 \
-	inttypes.m4 \
-	inttypes-pri.m4 \
-	isc-posix.m4 \
-	lcmessage.m4 \
-	lib-ld.m4 \
-	lib-link.m4 \
-	lib-prefix.m4 \
-	progtest.m4 \
-	stdint_h.m4 \
-	uintmax_t.m4 \
-	ulonglong.m4
+	m4/codeset.m4 \
+	m4/gettext.m4 \
+	m4/glibc21.m4 \
+	m4/iconv.m4 \
+	m4/intdiv0.m4 \
+	m4/inttypes_h.m4 \
+	m4/inttypes.m4 \
+	m4/inttypes-pri.m4 \
+	m4/isc-posix.m4 \
+	m4/lcmessage.m4 \
+	m4/lib-ld.m4 \
+	m4/lib-link.m4 \
+	m4/lib-prefix.m4 \
+	m4/progtest.m4 \
+	m4/stdint_h.m4 \
+	m4/uintmax_t.m4 \
+	m4/ulonglong.m4
 
 CLEANPO = \
-	boldquot.sed \
-	en@boldquot.header \
-	en@quot.header \
-	insert-header.sin \
-	Makevars.template \
-	quot.sed \
-	remove-potcdate.sin \
-	Rules-quot
+	po/boldquot.sed \
+	po/en@boldquot.header \
+	po/en@quot.header \
+	po/insert-header.sin \
+	po/Makevars.template \
+	po/quot.sed \
+	po/remove-potcdate.sin \
+	po/Rules-quot
 
 CLEANFILES = .noupdate
 
@@ -192,9 +192,9 @@ MAINTAINERCLEANFILES = \
 	stamp-h2.in \
 	stamp-h3.in \
 	stamp-h4.in \
-	$(addprefix scripts/, $(CLEANSCRIPTS)) \
-	$(addprefix m4/, $(CLEANMFOUR)) \
-	$(addprefix po/, $(CLEANPO))
+	$(CLEANSCRIPTS) \
+	$(CLEANMFOUR) \
+	$(CLEANPO)
 
 EXTRA_DIST = autogen.sh ChangeLogStamp
 
diff --git a/Makefile.in b/Makefile.in
index d61b7fb..04c3c7e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -18,15 +18,11 @@
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,7 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 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
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
@@ -65,10 +61,13 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -85,51 +84,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -139,8 +100,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -221,14 +180,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -248,9 +204,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -269,27 +224,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -301,6 +255,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -346,48 +301,51 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4 -I m4local
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 SUBDIRS = include src samples test po man doc scripts
 DISTDIRS = m4 m4extra
 CLEANSCRIPTS = \
-	depcomp \
-	install-sh \
-	ltconfig \
-	mdate-sh \
-	missing \
-	mkinstalldirs
+	scripts/depcomp \
+	scripts/install-sh \
+	scripts/ltconfig \
+	scripts/mdate-sh \
+	scripts/missing \
+	scripts/mkinstalldirs
 
 CLEANMFOUR = \
-	codeset.m4 \
-	gettext.m4 \
-	glibc21.m4 \
-	iconv.m4 \
-	intdiv0.m4 \
-	inttypes_h.m4 \
-	inttypes.m4 \
-	inttypes-pri.m4 \
-	isc-posix.m4 \
-	lcmessage.m4 \
-	lib-ld.m4 \
-	lib-link.m4 \
-	lib-prefix.m4 \
-	progtest.m4 \
-	stdint_h.m4 \
-	uintmax_t.m4 \
-	ulonglong.m4
+	m4/codeset.m4 \
+	m4/gettext.m4 \
+	m4/glibc21.m4 \
+	m4/iconv.m4 \
+	m4/intdiv0.m4 \
+	m4/inttypes_h.m4 \
+	m4/inttypes.m4 \
+	m4/inttypes-pri.m4 \
+	m4/isc-posix.m4 \
+	m4/lcmessage.m4 \
+	m4/lib-ld.m4 \
+	m4/lib-link.m4 \
+	m4/lib-prefix.m4 \
+	m4/progtest.m4 \
+	m4/stdint_h.m4 \
+	m4/uintmax_t.m4 \
+	m4/ulonglong.m4
 
 CLEANPO = \
-	boldquot.sed \
-	en@boldquot.header \
-	en@quot.header \
-	insert-header.sin \
-	Makevars.template \
-	quot.sed \
-	remove-potcdate.sin \
-	Rules-quot
+	po/boldquot.sed \
+	po/en@boldquot.header \
+	po/en@quot.header \
+	po/insert-header.sin \
+	po/Makevars.template \
+	po/quot.sed \
+	po/remove-potcdate.sin \
+	po/Rules-quot
 
 CLEANFILES = .noupdate
 MAINTAINERCLEANFILES = \
@@ -403,9 +361,9 @@ MAINTAINERCLEANFILES = \
 	stamp-h2.in \
 	stamp-h3.in \
 	stamp-h4.in \
-	$(addprefix scripts/, $(CLEANSCRIPTS)) \
-	$(addprefix m4/, $(CLEANMFOUR)) \
-	$(addprefix po/, $(CLEANPO))
+	$(CLEANSCRIPTS) \
+	$(CLEANMFOUR) \
+	$(CLEANPO)
 
 EXTRA_DIST = autogen.sh ChangeLogStamp
 all: config.h
@@ -449,7 +407,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -471,7 +429,6 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -504,8 +461,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -613,24 +569,22 @@ distdir: $(DISTFILES)
 	  exit 1;; \
 	esac
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(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 \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -644,7 +598,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -652,6 +606,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -662,7 +618,7 @@ distdir: $(DISTFILES)
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -736,7 +692,7 @@ distcheck: dist
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -806,12 +762,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -828,24 +792,26 @@ pdf-am:
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-libtool clean-recursive \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+	distclean distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am
 
 
 @SET_MAKE@
@@ -876,14 +842,14 @@ libtool: $(LIBTOOL_DEPS)
 ChangeLogPhony:
 	@cd $(top_srcdir) ; \
 	for f in `find . -name Entries -print | grep CVS` ; do \
-	  if /usr/bin/test ! -f ChangeLogStamp -o ChangeLogStamp -ot $$f ; then \
+	  if @TEST@ ! -f ChangeLogStamp -o ChangeLogStamp -ot $$f ; then \
 	    rm -f ChangeLogStamp ; \
 	    touch ChangeLogStamp ; \
 	  fi ; \
 	done
 
 ChangeLogStamp: ChangeLogPhony
-	@/bin/true
+	@@TRUE@
 
 ChangeLog: ChangeLogStamp
 	@cd $(top_srcdir) ; \
diff --git a/NEWS b/NEWS
index 7c0942f..92e33f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,28 +1,28 @@
-Welcome to Gutenprint 5.0.1!  Please read these release notes
+Welcome to Gutenprint 5.0.2!  Please read these release notes
 carefully.
 
 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, 10.3, and
-10.4) and Linux systems that in many cases equal or exceed proprietary
-vendor-supplied drivers in quality and functionality, and can be used
-for demanding printing tasks requiring flexibility and high quality.
-This software package includes an enhanced Print plug-in for the GIMP
-that replaces the plug-in packaged with the GIMP, and Ghostscript and
-CUPS drivers, as well as Foomatic data supporting the Ghostscript
-driver.
+quality printing for UNIX (including Macintosh OS X 10.2, 10.3, 10.4,
+and 10.5) and Linux systems that in many cases equal or exceed
+proprietary vendor-supplied drivers in quality and functionality, and
+can be used for demanding printing tasks requiring flexibility and
+high quality.  This software package includes an enhanced Print
+plug-in for GIMP that replaces the plug-in packaged with GIMP, and
+Ghostscript and CUPS drivers, as well as Foomatic data supporting the
+Ghostscript driver.
 
 Gutenprint has been renamed in order to clearly distinguish it from
-the GIMP.  While this package started out as the original Print plugin
-for the GIMP, it has expanded into a collection of general purpose
-printer drivers, and the new, enhanced Print plugin for the GIMP is
+GIMP.  While this package started out as the original Print plugin
+for GIMP, it has expanded into a collection of general purpose
+printer drivers, and the new, enhanced Print plugin for GIMP is
 now only a small part of the package.  Furthermore, the name
 Gutenprint recognizes Johannes Gutenberg, the inventor of the movable
 type printing press.  Finally, the word "guten" means "good" in
 German.
 
-Gutenprint 5.0.1 is a stable release of Gutenprint 5.0, with bug fixes
+Gutenprint 5.0.2 is a stable release of Gutenprint 5.0, with bug fixes
 and new features.
 
 Gutenprint currently supports over 800 printer models.
@@ -31,7 +31,8 @@ These release notes contain the following sections:
 
 I)    General Requirements
 II)   Changes from Previous Releases
-	A) Changes from 5.0.0 to 5.0.1
+	* New features and fixes in 5.0.2
+	* New features and fixes in 5.0.1
 III)  Overall changes from 4.2 to 5.0.
 	A) General user-visible changes
 	B) New Functionality
@@ -79,14 +80,13 @@ output with any of the printers supported by this package.  We
 strongly recommend using CUPS with Gutenprint as a general-purpose
 printing solution.
 
-The enhanced Print plug-in for the GIMP requires either the GIMP 2.0
-or above, or 1.2.3 or above on the 1.2 line (1.2.5 is recommended).
-This plug-in will work with any printing system, and offers a
-comprehensive user interface to control all aspects of the printing
-process.  If you are printing photographs in large format from the
-GIMP at very high resolution, disk space requirements may be
-substantial, and we recommend at least 2 GB of free disk space for
-that purpose.
+The enhanced Print plug-in for GIMP requires either GIMP 2.0 or above,
+or 1.2.3 or above on the 1.2 line (1.2.5 is recommended).  This
+plug-in will work with any printing system, and offers a comprehensive
+user interface to control all aspects of the printing process.  If you
+are printing photographs in large format from GIMP at very high
+resolution, disk space requirements may be substantial, and we
+recommend at least 2 GB of free disk space for that purpose.
 
 The Ghostscript driver requires GNU Ghostscript 6.53 or higher, ESP
 Ghostscript 7.05 or higher, or AFPL Ghostscript 7.04 or higher.  It
@@ -95,12 +95,12 @@ create a driver that may be built much more easily than traditional
 Ghostscript drivers.  This driver should be used in conjunction with
 Foomatic to configure printers.
 
-Users of Macintosh OS X 10.2 (Jaguar), 10.3 (Panther), and 10.4
-(Tiger) can use this package, as the printing system is based on CUPS.
-For ease of installation, a pre-built package with installer is
-normally supplied a few days after the release of the source package.
-We strongly recommend that OS X users use the pre-built package rather
-than attempt to build it themselves.
+Users of Macintosh OS X 10.2 (Jaguar), 10.3 (Panther), 10.4 (Tiger),
+and 10.5 (Leopard) can use this package, as the printing system is
+based on CUPS.  For ease of installation, a pre-built package with
+installer is normally supplied a few days after the release of the
+source package.  We strongly recommend that OS X users use the
+pre-built package rather than attempt to build it themselves.
 
 NOTE: This package will not work with any version of OS X 10.0 and
 10.1 (such as 10.1.5).  The printing system used with these versions
@@ -116,7 +116,138 @@ for building and installing Gutenprint.
 
 II) MAJOR CHANGES FROM PREVIOUS RELEASES
 
-A) NEW FEATURES AND FIXES IN GUTENPRINT 5.0.1:
+*) NEW FEATURES AND FIXES IN GUTENPRINT 5.0.2:
+
+   1) New printers supported in this release:
+
+      * Epson inkjet printers:
+
+	Epson Stylus CX4400
+	Epson Stylus CX4900
+	Epson Stylus CX5600
+	Epson Stylus CX7400
+	Epson Stylus CX9400
+	Epson Stylus DX4050
+	Epson Stylus Photo RX595
+	Epson Stylus C110
+	Epson Stylus C120
+	Epson Stylus D120
+	Epson PM 670C
+	Epson PX V780
+
+      * Canon inkjet printers:
+
+	Canon MP710
+	Canon MP740
+
+      * PCL laser printers:
+
+      	Sharp AR-M257
+	HP LserJet 1022
+
+   2) Preliminary support for the following printers:
+
+      * Canon inkjet printers:
+
+	Canon BJC5100
+	Canon BJC5500
+	Canon BJC8500
+	Canon Pixma iP4500
+	Canon Pixma iP5300
+	Canon Pixma iP8500
+	Canon Pixma iX5000
+	Canon Pixma MP170
+	Canon Pixma MP180
+	Canon Pixma MP610
+	Canon Pixma Pro 9500
+	Canon i80
+
+      * Dye sublimation printers:
+
+	Canon SELPHY ES1 (*)
+	Canon SELPHY ES2 (*)
+	Canon SELPHY ES20(*)
+	Shinko CHC S9045
+
+	(*) Note that these printers may not work on all systems due to
+	    communication requirements.
+
+   3) All native CUPS PPD files are now perfectly compliant with the
+      PPD specification, as tested under CUPS 1.2.  Fixing this
+      requires some changes to the internal resolution names.  These
+      changes should be transparent if PPD files are updated with
+      cups-genppdupdate.5.1.
+
+   4) Borderless printing on the Epson Stylus Photo 2200 now works
+      correctly.
+
+   5) The printer maintenance utility for EPSON inkjet printers,
+      escputil, now reports status more reliably.  Previously some
+      people reported errors of the form "Unknown IEEE 1284.4 error";
+      these errors have been resolved.
+
+      In addition, escputil now correctly reports the ink color for
+      certain printers (in particular, printers using Claria (TM) inks
+      and printers using alternate ink cartridges (for example, the
+      Stylus Photo 1400 that allows either a photo black or a matte
+      black ink cartridge to be installed).
+
+   6) A bug in which certain data was not printed correctly by Canon
+      inkjet printers was fixed (in areas where the entire area was
+      filled with maximum color density, some lines could be silently
+      discarded).
+
+   7) A bug involving excessive memory consumption in certain cases
+      has been fixed.  Printing multiple page documents on Canon
+      inkjet printers with the Duplex option set to Long Edge resulted
+      in very large memory consumption on alternate pages, which was
+      not released until the job completed.  For example, in color at
+      600 DPI, the memory consumption would be about 120 megabytes on
+      alternate pages, so printing a 100 page document would result in
+      6 GB of memory consumption.  Depending upon the system, the
+      results might be that the job would fail to print or would only
+      partially print, the system might run very slowly while the job
+      was being processed, or other components of the system might
+      fail.
+
+   8) Various fixes for the Canon iP4000, iP4200, and i560.  Color
+      improvements have been made on the iP4200.
+
+   9) The paper size for the CD - Custom paper size has been changed
+      to 120 mm from 118.8 mm to allow correct printing from CUPS.
+
+   10) A compile problem on Solaris has been fixed.
+
+   11) It is now possible to specify the printer model to all escputil
+      commands, via the -m option.  It is no longer necessary to use
+      the -u option to specify a new printer vs. an old printer.
+
+   12) The Epson driver will not select resolutions higher than
+      5760x1440 for the automatic quality settings, as we have
+      determined that many current printers offer poor quality at the
+      bottom of the page with resolutions of 2880x2880 and 5760x2880.
+      We have not removed these resolutions altogether, as they may
+      work well for certain applications, but they will not be
+      automatically selected by the Best or Ultra Photo quality
+      settings.
+
+   13) A problem where in some cases certain options were not handled
+      correctly by the CUPS driver has been fixed.  In particular,
+      yes/no options such as borderless printing were not handled
+      correctly in all cases when the printing system is CUPS 1.2 or
+      1.3.
+
+   14) The CUPS driver in Gutenprint, and all associated utilities,
+      are now licensed as GPL v2 or higher.  That code was previously
+      licensed as GPL v2 only.  While that did not cause any direct
+      problems, since the CUPS driver does not form a library that
+      other code may wish to link against, it was licensed differently
+      from the rest of the Gutenprint project.  That is now resolved,
+      and the entire Gutenprint code base is now licensed as GPL v2 or
+      higher.
+
+
+*) NEW FEATURES AND FIXES IN GUTENPRINT 5.0.1:
 
   1) New printers supported in this release:
 
@@ -389,10 +520,9 @@ A) GENERAL USER-VISIBLE CHANGES:
      Any profiles generated against Gimp-Print 4.2 are unlikely to
      produce good results with Gutenprint 5.0.  The color generation
      is sufficiently different that you will need to create new
-     profiles against Gutenprint 5.0.  In general, color adjustment
-     should not change between Gutenprint 5.0 releases starting with
-     release 5.0.0.  Color adjustments may change during beta
-     (5.0.0-beta) and release candidate (5.0.0-rc) phases.
+     profiles against Gutenprint 5.0.  In general, unless otherwise
+     noted in the release notes, color adjustment should not change
+     between Gutenprint 5.0 releases starting with release 5.0.0.
 
   6) The old man pages, and src/ghost/README, have been withdrawn.
      These pages, and the Ghostscript README file, were based on the
diff --git a/README b/README
index 07d8087..dc2d1bb 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
-Welcome to Gutenprint 5.0.1!  Please read these notes carefully.
+Welcome to Gutenprint 5.0.2!  Please read these notes carefully.
 
 ================================================================
 
 I) INTRODUCTION
 
-    This is Gutenprint version 5.0.1, a stable release of Gutenprint
+    This is Gutenprint version 5.0.2, 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
@@ -18,13 +18,12 @@ I) INTRODUCTION
     and beyond.
 
     Gutenprint has been renamed in order to clearly distinguish it
-    from the GIMP.  While this package started out as the Print plugin
-    for the GIMP, it has expanded into a collection of general purpose
-    printer drivers, and the enhanced Print plugin for the GIMP is now
-    only a small part of the package.  Furthermore, the name
-    Gutenprint recognizes Johannes Gutenberg, the inventor of the
-    movable type printing press.  Finally, the word "guten" means
-    "good" in German.
+    from GIMP.  While this package started out as the Print plugin for
+    GIMP, it has expanded into a collection of general purpose printer
+    drivers, and the enhanced Print plugin for GIMP is now only a
+    small part of the package.  Furthermore, the name Gutenprint
+    recognizes Johannes Gutenberg, the inventor of the movable type
+    printing press.  Finally, the word "guten" means "good" in German.
 
     Please read the user's manual (in ODF format as
     doc/gutenprint-users-manual.odt or PDF format as
@@ -79,7 +78,8 @@ A) OVERVIEW
 
       - The core driver library (required for everything else)
       - A CUPS (Common UNIX Printing System) driver
-      - An enhanced Print plug-in for the GIMP
+      - An enhanced Print plug-in for GIMP
+      - GTK-based UI libraries (used by the enhanced GIMP plug-in)
       - Support for the Foomatic spooler configuration system
       - A Ghostscript driver using the IJS plugin facility
       - A command-line utility to administer and maintain Epson
@@ -115,23 +115,21 @@ A) OVERVIEW
 	gimp-print-devel@lists.sourceforge.net
 
 	================================================================
-	  Release: gutenprint 5.0.1 generated on 22 Jul 2006
+	  Release: gutenprint 5.0.2 generated on 29 Dec 2007
 
 	  Features:
 	    Build CUPS:                                 yes, installing in /usr
-		Build CUPS PPD files:                   yes
-		    Build translated CUPS PPD files:    no
-		    Build simplified CUPS PPD files:    no
-		    Generate PS level 3 CUPS PPD files: yes
-		Install CUPS PPD files at top level:    no
+		Build CUPS 1.2 enhancements:            yes
+		Build CUPS PPD files:                   no
+		Generate PS level 3 CUPS PPD files:     yes
 		Build genppd statically:                yes
 	    Build Ghostscript IJS driver:               yes
 	    Build Foomatic data:                        yes
 		Build Foomatic 3.x data:                yes
-	    Build enhanced Print plugin for the GIMP:   yes
+	    Build enhanced Print plugin for GIMP:       yes
 		Build GIMP 1.2 plugin:                  yes
 		Build GIMP 2.x plugin:                  yes
-		    GIMP 2.x plugin will be named:      print
+		    GIMP 2.x plugin will be named:      gutenprint
 		Install plugin(s) in home directory:    no
 	    Build EPSON Stylus utility:                 yes
 	    Build test programs:                        yes
@@ -141,15 +139,16 @@ 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.1/xml
-	    Module directory:                           /usr/local/lib/gutenprint/5.0.1/modules
+	    XML data directory:                         /usr/local/share/gutenprint/5.0.2/xml
+	    Module directory:                           /usr/local/lib/gutenprint/5.0.2/modules
 	    Install sample images:                      yes
 
 	General configuration:
-	    Compiler options:                           -g -O2  -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -finline-limit=1048576 -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls
+	    Compiler options:                           -Disfinite=finite  -O6  -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=1048576 -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls
 	    Build static libraries:                     yes
 	    Build shared libraries:                     no
 	    Maintainer mode:                            yes
+	    Use i18n:                                   yes
 	    Generate profiling information:             no
 	    Generate debugging symbols:                 no
 	    Use modules:                                static
@@ -205,6 +204,9 @@ B) CORE DRIVER LIBRARY
       development (4.3, 5.1).  Therefore, you should consider allowing
       Gutenprint 5.0 and Gimp-Print 4.2 to be installed concurrently.
 
+    * The core driver library component also includes locale files for
+      the libary and documentation.
+
 
 ----------------
 
@@ -216,8 +218,8 @@ B) CUPS
     information may be found at http://www.cups.org.  Gutenprint 5.0
     requires CUPS 1.1.9 or higher.  We recommend use of 1.1.15 or
     above; that release of CUPS fixes some important bugs.  Gutenprint
-    supports CUPS 1.2, but at this time does not take advantage of the
-    new features of that release.
+    supports CUPS 1.2, and supports the CUPS 1.2 enhancements,
+    including dynamic PPD file generation.
 
     Gutenprint will normally detect the presence of CUPS on your
     system and will attempt to build the CUPS driver if it finds CUPS
@@ -254,7 +256,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.1 with Gutenprint 5.0.1.
+      Gutenprint 5.0.2 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
@@ -276,10 +278,10 @@ B) CUPS
 	This will happen if all of the following are true:
 
 	i) The cups-config provided by the CUPS driver adds
-	   -Wl,rpath=/usr/lib. This is done by some versions of CUPS
-	   reportedly because in some cases the runtime linker does
-	   not pick up libraries out of /usr/lib.  This can be checked
-	   by running
+	   -Wl,rpath=/usr/lib (or wherever the CUPS system libraries
+	   live). This is done by some versions of CUPS reportedly
+	   because in some cases the runtime linker does not pick up
+	   libraries out of /usr/lib.  This can be checked by running
 
 	   cups-config --libs --ldflags
 
@@ -288,10 +290,10 @@ B) CUPS
 	   the CUPS installation on your system.
 
 	ii) There is presently a version of Gutenprint installed in
-	   /usr (--prefix=/usr) rather than /usr/local or the like.
-	   The default location of Gutenprint installation is in
-	   /usr/local, but system vendors typically install Gutenprint
-	   in /usr.
+	   the system default, typically /usr (--prefix=/usr) rather
+	   than /usr/local or the like.  The default location of
+	   Gutenprint installation is in /usr/local, but system
+	   vendors typically install Gutenprint in /usr.
 
 	iii) Gutenprint is built dynamically only (--disable-static or
 	   --disable-static-genppd).  This is not a default, and
@@ -516,45 +518,45 @@ C) FOOMATIC
 
 ----------------
 
-D) THE GIMP
-
-    Gutenprint may be used with an enhanced Print plug-in for the
-    GIMP, providing the ability to print images.  If you wish to do
-    so, you must use the GIMP 1.2.3 or above on the 1.2 line, or any
-    GIMP 2.x release (2.0, 2.1, 2.2, etc.)  Please read the release
-    notes in addition to this README, as there have been some changes
-    in procedure since Gimp-Print 4.2 if you are using certain
-    versions of the GIMP.
-
-    The enhanced Print plugin for the GIMP replaces the Gimp-Print
-    4.2-based plugin provided with the GIMP 2.0 and 2.2.  As of the
-    GIMP 2.4, the GIMP team provides a new Print plugin based on the
-    GtkPrint framework.  This plugin provides standard printing
-    capabilities, but does not provide all of the new Gutenprint 5.0
-    features.  Therefore, the enhanced Print plugin for the GIMP
-    distributed with Gutenprint does not replace that plugin, but is
-    installed alongside that plugin.
+D) GIMP
+
+    Gutenprint may be used with an enhanced Print plug-in for GIMP,
+    providing the ability to print images.  If you wish to do so, you
+    must use GIMP 1.2.3 or above on the 1.2 line, or any GIMP 2.x
+    release (2.0, 2.1, 2.2, etc.)  Please read the release notes in
+    addition to this README, as there have been some changes in
+    procedure since Gimp-Print 4.2 if you are using certain versions
+    of GIMP.
+
+    The enhanced Print plugin for GIMP replaces the Gimp-Print
+    4.2-based plugin provided with GIMP 2.0 and 2.2.  As of the GIMP
+    2.4, GIMP team provides a new Print plugin based on the GtkPrint
+    framework.  This plugin provides standard printing capabilities,
+    but does not provide all of the new Gutenprint 5.0 features.
+    Therefore, the enhanced Print plugin for GIMP distributed with
+    Gutenprint does not replace that plugin, but is installed
+    alongside that plugin.
 
     If your system separates development packages from runtime
     packages, you will typically have to install development packages
-    for the GIMP itself, in addition to GTK and glib.  With the GIMP
-    2.x and GTK 2.x, additional packages may be required.
+    for GIMP itself, in addition to GTK and glib.  With GIMP 2.x and
+    GTK 2.x, additional packages may be required.
 
     Normally, the Gutenprint configure script detects which version,
-    if any, of the GIMP is installed and builds an appropriate plugin.
-    If the configure script does not detect it properly, you may need
-    to specify --with-gimp or --with-gimp2.  However, it's more likely
+    if any, of GIMP is installed and builds an appropriate plugin.  If
+    the configure script does not detect it properly, you may need to
+    specify --with-gimp or --with-gimp2.  However, it's more likely
     that you need to install appropriate development packages.
 
-    Normally Gutenprint installs the GIMP Print plugin in your system
+    Normally Gutenprint installs GIMP Print plugin in your system
     plug-in directory.  If you wish to install it in your personal
     plugin directory, you may use
 
     ./configure --enable-user-install
 
-    It is not possible for Gimp-Print 4.2 and Gutenprint 5.0 (or any
-    future release) to coexist in the same installation of the GIMP.
-    The Gutenprint 5.0-based plugin can read settings from previous
+    It is not possible for Gimp-Print 4.2 and Gutenprint 5.1 (or any
+    future release) to coexist in the same installation of GIMP.  The
+    Gutenprint 5.0-based plugin can read settings from previous
     versions of Gimp-Print, but the configuration file format in
     Gutenprint 5.0 cannot be read by older versions of Gimp-Print.
 
@@ -567,11 +569,11 @@ D) THE GIMP
 
     NOTE TO PACKAGERS:
 
-    * The GIMP plugin, unlike the core library and the Foomatic and
-      CUPS drivers, may not be installed concurrently with other
-      versions.  For example, you may not install both the Gimp-Print
-      4.2 and the Gutenprint 5.0 version of the Print plugin, as they
-      use different configuration file formats.
+    * The enhanced GIMP plugin, unlike the core library and the
+      Foomatic and CUPS drivers, may not be installed concurrently
+      with other versions.  For example, you may not install both the
+      Gimp-Print 4.2 and the Gutenprint 5.1 version of the Print
+      plugin, as they use different configuration file formats.
 
 
 ----------------
@@ -629,8 +631,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.1
-    Epson Stylus Photo R300 - CUPS+Gutenprint v5.0.1 Simplified
+    Epson Stylus Photo R300 - CUPS+Gutenprint v5.0.2
+    Epson Stylus Photo R300 - CUPS+Gutenprint v5.0.2 Simplified
 
     The "simplified" PPD files offer a basic set of options only, for
     selecting printer options, standard paper sizes, and basic quality
@@ -660,12 +662,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.1-beta4 will not
-    work with driver version 5.0.1.  You can identify printers using
+    For example, PPD files built for Gutenprint 5.0.1 will not
+    work with driver version 5.0.2.  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.1(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.2(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 fb9891f..eb3d8af 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006  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.
@@ -11,9 +11,406 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
+# Configure paths for GLIB
+# Owen Taylor     97-11-3
+
+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
+dnl gthread is specified in MODULES, pass to glib-config
+dnl
+AC_DEFUN([AM_PATH_GLIB],
+[dnl 
+dnl Get the cflags and libraries from the glib-config script
+dnl
+AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)],
+            glib_config_prefix="$withval", glib_config_prefix="")
+AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
+            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
+AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
+		    , enable_glibtest=yes)
+
+  if test x$glib_config_exec_prefix != x ; then
+     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
+     if test x${GLIB_CONFIG+set} != xset ; then
+        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
+     fi
+  fi
+  if test x$glib_config_prefix != x ; then
+     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
+     if test x${GLIB_CONFIG+set} != xset ; then
+        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
+     fi
+  fi
+
+  for module in . $4
+  do
+      case "$module" in
+         gmodule) 
+             glib_config_args="$glib_config_args gmodule"
+         ;;
+         gthread) 
+             glib_config_args="$glib_config_args gthread"
+         ;;
+      esac
+  done
+
+  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
+  min_glib_version=ifelse([$1], ,0.99.7,$1)
+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+  no_glib=""
+  if test "$GLIB_CONFIG" = "no" ; then
+    no_glib=yes
+  else
+    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
+    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_glibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      LIBS="$GLIB_LIBS $LIBS"
+dnl
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+dnl checks the results of glib-config to some extent
+dnl
+      rm -f conf.glibtest
+      AC_TRY_RUN([
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.glibtest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_glib_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_glib_version");
+     exit(1);
+   }
+
+  if ((glib_major_version != $glib_config_major_version) ||
+      (glib_minor_version != $glib_config_minor_version) ||
+      (glib_micro_version != $glib_config_micro_version))
+    {
+      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+             glib_major_version, glib_minor_version, glib_micro_version);
+      printf ("*** was found! If glib-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
+      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
+           (glib_micro_version != GLIB_MICRO_VERSION))
+    {
+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     glib_major_version, glib_minor_version, glib_micro_version);
+    }
+  else
+    {
+      if ((glib_major_version > major) ||
+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
+               glib_major_version, glib_minor_version, glib_micro_version);
+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
+        printf("*** correct copy of glib-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_glib" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     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"
+       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
+       echo "*** full path to glib-config."
+     else
+       if test -f conf.glibtest ; then
+        :
+       else
+          echo "*** Could not run GLIB test program, checking why..."
+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          LIBS="$LIBS $GLIB_LIBS"
+          AC_TRY_LINK([
+#include <glib.h>
+#include <stdio.h>
+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
+        [ 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" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GLIB_CFLAGS=""
+     GLIB_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GLIB_CFLAGS)
+  AC_SUBST(GLIB_LIBS)
+  rm -f conf.glibtest
+])
+
+# Configure paths for GTK+
+# Owen Taylor     97-11-3
+
+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+dnl
+AC_DEFUN([AM_PATH_GTK],
+[dnl 
+dnl Get the cflags and libraries from the gtk-config script
+dnl
+AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
+            gtk_config_prefix="$withval", gtk_config_prefix="")
+AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
+            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
+		    , enable_gtktest=yes)
+
+  for module in . $4
+  do
+      case "$module" in
+         gthread) 
+             gtk_config_args="$gtk_config_args gthread"
+         ;;
+      esac
+  done
+
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+     fi
+  fi
+
+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+  min_gtk_version=ifelse([$1], ,0.99.7,$1)
+  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+  no_gtk=""
+  if test "$GTK_CONFIG" = "no" ; then
+    no_gtk=yes
+  else
+    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
+dnl checks the results of gtk-config to some extent
+dnl
+      rm -f conf.gtktest
+      AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gtktest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If gtk-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+	   (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     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"
+       echo "*** your path, or set the GTK_CONFIG environment variable to the"
+       echo "*** full path to gtk-config."
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK test program, checking why..."
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK or finding the wrong"
+          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
+        [ 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" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+  rm -f conf.gtktest
+])
+
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 AC_PROG_LIBTOOL
+# serial 51 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -176,7 +573,7 @@ test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -263,8 +660,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 # Check for compiler boilerplate output or warnings with
 # the simple compiler test code.
 AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -276,8 +674,9 @@ $rm conftest*
 # Check for linker boilerplate output or warnings with
 # the simple link test code.
 AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -293,12 +692,20 @@ $rm conftest*
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
 AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 ])# _LT_AC_SYS_LIBPATH_AIX
 
@@ -529,13 +936,17 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -552,6 +963,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
       ;;
     *64-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -623,7 +1037,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$3"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -664,11 +1078,12 @@ fi
 # ------------------------------------------------------------
 # Check whether the given compiler option works
 AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
   [$2=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -782,24 +1197,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 ])
@@ -1026,7 +1444,8 @@ fi
 # ---------------------------------
 # Check to see if options -c and -o are simultaneously supported by compiler
 AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -1034,7 +1453,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -1174,6 +1593,7 @@ else
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          AC_MSG_RESULT([yes])
        else
   AC_MSG_RESULT([no])
@@ -1191,7 +1611,8 @@ fi
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
 AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -1205,20 +1626,58 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+fi])
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -1375,12 +1834,8 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -1397,18 +1852,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -1446,7 +1889,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -1509,7 +1952,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[[3-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1564,7 +2007,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1580,7 +2023,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -1593,18 +2036,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -1686,6 +2117,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -1791,7 +2226,8 @@ fi
 # _LT_AC_TAGCONFIG
 # ----------------
 AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
         [include additional configurations @<:@automatic@:>@])],
     [tagnames="$withval"])
@@ -2052,7 +2488,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
 
 # AC_PATH_TOOL_PREFIX
 # -------------------
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
 AC_DEFUN([AC_PATH_TOOL_PREFIX],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_MSG_CHECKING([for $1])
@@ -2115,7 +2551,7 @@ fi
 
 # AC_PATH_MAGIC
 # -------------
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
 AC_DEFUN([AC_PATH_MAGIC],
 [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -2262,7 +2698,7 @@ esac
 # how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -2301,16 +2737,22 @@ cygwin*)
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -2348,7 +2790,7 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
-interix3*)
+interix[[3-9]]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
   ;;
@@ -2364,7 +2806,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2398,6 +2840,10 @@ osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -2450,7 +2896,7 @@ AC_DEFUN([AC_PROG_NM],
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
@@ -2666,10 +3112,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 _LT_AC_SYS_COMPILER
 
@@ -2771,10 +3217,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -2920,7 +3366,7 @@ case $host_os in
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  :
 	else
 	  # We have old collect2
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -3079,10 +3525,10 @@ case $host_os in
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -3116,7 +3562,7 @@ case $host_os in
   freebsd-elf*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3165,9 +3611,7 @@ case $host_os in
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;
@@ -3235,7 +3679,7 @@ case $host_os in
 	;;
     esac
     ;;
-  interix3*)
+  interix[[3-9]]*)
     _LT_AC_TAGVAR(hardcode_direct, $1)=no
     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -3275,7 +3719,7 @@ case $host_os in
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -3355,6 +3799,29 @@ case $host_os in
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -3393,16 +3860,20 @@ case $host_os in
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
   openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -3564,15 +4035,10 @@ case $host_os in
 	case $host_os in
 	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -3619,6 +4085,12 @@ case $host_os in
 	  fi
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -3862,7 +4334,7 @@ $rm -f confest.$objext
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
-interix3*)
+interix[[3-9]]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   _LT_AC_TAGVAR(predep_objects,$1)=
@@ -3870,13 +4342,46 @@ interix3*)
   _LT_AC_TAGVAR(postdeps,$1)=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
@@ -3925,10 +4430,17 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -4007,10 +4519,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -4063,7 +4575,7 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -4152,6 +4664,7 @@ if test -f "$ltmain"; then
     _LT_AC_TAGVAR(module_cmds, $1) \
     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
     _LT_AC_TAGVAR(exclude_expsyms, $1) \
     _LT_AC_TAGVAR(include_expsyms, $1); do
 
@@ -4198,7 +4711,7 @@ ifelse([$1], [],
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -4523,7 +5036,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
@@ -4606,6 +5119,7 @@ fi
 # ---------------------------------
 AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
 [AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
 AC_REQUIRE([AC_PROG_NM])
 AC_REQUIRE([AC_OBJEXT])
 # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4642,7 +5156,7 @@ hpux*) # Its linker distinguishes data from code symbols
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[[ABCDGIRSTW]]'
     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -4832,12 +5346,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # like `-m68040'.
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -4849,7 +5365,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # DJGPP does not support shared libraries at all
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -4915,7 +5431,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -4958,7 +5474,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4985,6 +5501,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -5105,13 +5629,15 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
 
@@ -5121,7 +5647,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -5179,7 +5705,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
@@ -5212,7 +5738,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5231,6 +5757,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
         # All Alpha code is PIC.
         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -5240,6 +5782,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
     solaris*)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5334,7 +5880,8 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
 # ------------------------------------
 # See if the linker supports building shared libraries.
 AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -5351,7 +5898,7 @@ ifelse([$1],[CXX],[
     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -5490,7 +6037,7 @@ EOF
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_AC_TAGVAR(always_export_symbols, $1)=no
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -5508,7 +6055,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -5523,7 +6070,7 @@ EOF
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -5541,13 +6088,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5587,7 +6143,7 @@ EOF
 
     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
       case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
@@ -5706,7 +6262,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+  	  :
 	  else
   	  # We have old collect2
   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -5799,7 +6355,7 @@ _LT_EOF
       # The linker will automatically build a .lib file if we build a DLL.
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
       _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
@@ -5841,10 +6397,10 @@ _LT_EOF
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -5884,7 +6440,7 @@ _LT_EOF
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6006,24 +6562,28 @@ _LT_EOF
       ;;
 
     openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
@@ -6082,17 +6642,16 @@ _LT_EOF
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
@@ -6149,7 +6708,7 @@ _LT_EOF
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6224,7 +6783,7 @@ x|xyes)
       # to ld, don't add -lc before -lgcc.
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
         soname=conftest
@@ -6327,6 +6886,30 @@ AC_DEFUN([LT_AC_PROG_RC],
 [AC_CHECK_TOOL(RC, windres, no)
 ])
 
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
 #  a released version of Autoconf we should remove this    #
@@ -6347,12 +6930,13 @@ do
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6385,6 +6969,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
 done
 ])
 SED=$lt_cv_path_SED
+AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
 
@@ -6526,7 +7111,8 @@ installed software in a non-standard prefix.
 
 _PKG_TEXT
 ])],
-		[$4])
+		[AC_MSG_RESULT([no])
+                $4])
 elif test $pkg_failed = untried; then
 	ifelse([$4], , [AC_MSG_FAILURE(dnl
 [The pkg-config script could not be found or is too old.  Make sure it
@@ -6545,7 +7131,7 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -6555,14 +7141,29 @@ fi[]dnl
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -6642,14 +7243,14 @@ AU_DEFUN([fp_PROG_CC_STDC])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # 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 7
+# serial 8
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -6658,8 +7259,10 @@ AC_DEFUN([AM_CONDITIONAL],
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -6673,15 +7276,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # 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
+# serial 9
 
 # 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,
@@ -6709,6 +7311,7 @@ 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], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -6774,6 +7377,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
        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/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        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
@@ -6826,7 +7430,8 @@ if test "x$enable_dependency_tracking" != xno; then
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -6851,8 +7456,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # 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
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -6911,8 +7517,8 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -6935,16 +7541,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -6964,6 +7574,9 @@ m4_ifval([$2],
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -6999,6 +7612,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
 
@@ -7034,7 +7651,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -7160,16 +7777,50 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
+# Copyright (C) 1999, 2000, 2001, 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 5
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
+
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 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 4
+# serial 5
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -7185,6 +7836,7 @@ AC_SUBST($1)])
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -7195,7 +7847,7 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -7203,60 +7855,23 @@ fi
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
@@ -7385,9 +8000,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006  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.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
@@ -7497,395 +8124,3 @@ m4_include([m4/stp_cups.m4])
 m4_include([m4/stp_gimp.m4])
 m4_include([m4/stp_option.m4])
 m4_include([m4/stp_release.m4])
-# Configure paths for GLIB
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
-dnl gthread is specified in MODULES, pass to glib-config
-dnl
-AC_DEFUN([AM_PATH_GLIB],
-[dnl 
-dnl Get the cflags and libraries from the glib-config script
-dnl
-AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)],
-            glib_config_prefix="$withval", glib_config_prefix="")
-AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
-            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  if test x$glib_config_exec_prefix != x ; then
-     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-     fi
-  fi
-  if test x$glib_config_prefix != x ; then
-     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-     fi
-  fi
-
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             glib_config_args="$glib_config_args gmodule"
-         ;;
-         gthread) 
-             glib_config_args="$glib_config_args gthread"
-         ;;
-      esac
-  done
-
-  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-  min_glib_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-  no_glib=""
-  if test "$GLIB_CONFIG" = "no" ; then
-    no_glib=yes
-  else
-    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of glib-config to some extent
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If glib-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-        printf("*** correct copy of glib-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     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"
-       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-       echo "*** full path to glib-config."
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ 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" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  rm -f conf.glibtest
-])
-
-# Configure paths for GTK+
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
-dnl
-AC_DEFUN([AM_PATH_GTK],
-[dnl 
-dnl Get the cflags and libraries from the gtk-config script
-dnl
-AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
-            gtk_config_prefix="$withval", gtk_config_prefix="")
-AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
-            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
-		    , enable_gtktest=yes)
-
-  for module in . $4
-  do
-      case "$module" in
-         gthread) 
-             gtk_config_args="$gtk_config_args gthread"
-         ;;
-      esac
-  done
-
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  fi
-
-  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-  min_gtk_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-  no_gtk=""
-  if test "$GTK_CONFIG" = "no" ; then
-    no_gtk=yes
-  else
-    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK is sufficiently new. (Also sanity
-dnl checks the results of gtk-config to some extent
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gtktest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If gtk-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-#endif /* defined (GTK_MAJOR_VERSION) ... */
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     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"
-       echo "*** your path, or set the GTK_CONFIG environment variable to the"
-       echo "*** full path to gtk-config."
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK test program, checking why..."
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK or finding the wrong"
-          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ 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" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
-
diff --git a/config.h.in b/config.h.in
index d9c6ad2..54cb95f 100644
--- a/config.h.in
+++ b/config.h.in
@@ -121,6 +121,9 @@
 /* Build a modular libgutenprint */
 #undef MODULE
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* The operating system to build for */
 #undef OSTYPE
 
diff --git a/configure b/configure
index da75b1c..f435330 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.151.2.2 .
+# From configure.ac Revision: 1.151.2.5 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for gutenprint 5.0.1.
+# Generated by GNU Autoconf 2.61 for gutenprint 5.0.2.
 #
 # Report bugs to <gimp-print-devel@lists.sourceforge.net>.
 #
@@ -30,7 +30,8 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -39,10 +40,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  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
@@ -235,7 +239,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; }
 else
   as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -253,7 +257,6 @@ IFS=$as_save_IFS
 	 # 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=:
@@ -262,10 +265,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  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
@@ -273,7 +278,6 @@ _ASEOF
   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=:
@@ -282,10 +286,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  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 () {
@@ -532,19 +538,28 @@ else
   as_mkdir_p=false
 fi
 
-# 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"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # 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'"
@@ -731,44 +746,44 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='gutenprint'
 PACKAGE_TARNAME='gutenprint'
-PACKAGE_VERSION='5.0.1'
-PACKAGE_STRING='gutenprint 5.0.1'
+PACKAGE_VERSION='5.0.2'
+PACKAGE_STRING='gutenprint 5.0.2'
 PACKAGE_BUGREPORT='gimp-print-devel@lists.sourceforge.net'
 
 ac_unique_file="src/main/print-vars.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
@@ -825,6 +840,7 @@ GUTENPRINTUI2_BINARY_AGE
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
+am__isrc
 CYGPATH_W
 PACKAGE
 VERSION
@@ -868,6 +884,7 @@ AMDEPBACKSLASH
 CCDEPMODE
 am__fastdepCC_TRUE
 am__fastdepCC_FALSE
+SED
 GREP
 EGREP
 LN_S
@@ -905,10 +922,12 @@ GTK2_LIBS
 GIMP2_CFLAGS
 GIMP2_LIBS
 LEX
-LEXLIB
 LEX_OUTPUT_ROOT
+LEXLIB
 YACC
 YFLAGS
+TEST
+TRUE
 FIND
 PERL
 GLIB_MKENUMS
@@ -1043,6 +1062,7 @@ target_alias
 CC
 CFLAGS
 LDFLAGS
+LIBS
 CPPFLAGS
 CPP
 CXX
@@ -1163,10 +1183,10 @@ do
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
     eval enable_$ac_feature=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
@@ -1182,10 +1202,10 @@ do
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
     eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
@@ -1379,19 +1399,19 @@ do
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
     eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
     eval with_$ac_package=no ;;
 
   --x)
@@ -1560,7 +1580,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.1 to adapt to many kinds of systems.
+\`configure' configures gutenprint 5.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1630,7 +1650,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gutenprint 5.0.1:";;
+     short | recursive ) echo "Configuration of gutenprint 5.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1660,8 +1680,8 @@ Optional Features:
                           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
-                          this! [(automatic)]
+                          and NEWS (release notes) CAREFULLY before using
+                          --disable-static-genppd! [(automatic)]
   --enable-debug          turn on debugging in build [no]
   --enable-profile        turn on profiling in build [no]
   --disable-gtktest       Do not try to compile and run a test GTK program
@@ -1720,6 +1740,7 @@ 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>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
   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
@@ -1804,8 +1825,8 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gutenprint configure 5.0.1
-generated by GNU Autoconf 2.60
+gutenprint configure 5.0.2
+generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1835,8 +1856,8 @@ 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.1, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+It was created by gutenprint $as_me 5.0.2, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
@@ -2227,12 +2248,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 GUTENPRINT_MAJOR_VERSION=5
 GUTENPRINT_MINOR_VERSION=0
-GUTENPRINT_MICRO_VERSION=1
+GUTENPRINT_MICRO_VERSION=2
 GUTENPRINT_EXTRA_VERSION=
 GUTENPRINT_CURRENT_INTERFACE=2
 GUTENPRINT_INTERFACE_AGE=0
 GUTENPRINT_BINARY_AGE=0
-GUTENPRINT_VERSION=5.0.1
+GUTENPRINT_VERSION=5.0.2
 GUTENPRINTUI_CURRENT_INTERFACE=1
 GUTENPRINTUI_INTERFACE_AGE=0
 GUTENPRINTUI_BINARY_AGE=0
@@ -2273,7 +2294,8 @@ CXXFLAGS="${CXXFLAGS:=}"
 LDFLAGS="${LDFLAGS:=}"
 LIBS="${LIBS:=}"
 
-am__api_version="1.9"
+am__api_version='1.10'
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -2310,7 +2332,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 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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.
@@ -2425,38 +2447,53 @@ else
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 for ac_prog in gawk mawk nawk awk
 do
@@ -2476,7 +2513,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -2539,12 +2576,16 @@ else
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -2559,7 +2600,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gutenprint'
- VERSION='5.0.1'
+ VERSION='5.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2587,7 +2628,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -2611,7 +2652,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -2651,7 +2692,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -2691,7 +2732,7 @@ else
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -3020,9 +3061,7 @@ if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -3031,7 +3070,6 @@ else
 fi
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3054,7 +3092,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3094,7 +3132,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3151,7 +3189,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3192,7 +3230,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3250,7 +3288,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3294,7 +3332,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -3435,7 +3473,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 # 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
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
@@ -3463,6 +3501,12 @@ done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
+  ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3474,8 +3518,6 @@ 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; }
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
@@ -3653,27 +3695,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -3728,27 +3753,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -3783,27 +3791,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -3839,27 +3830,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -3975,27 +3949,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
@@ -4099,6 +4056,7 @@ else
        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/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        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
@@ -4128,9 +4086,7 @@ fi
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -4155,12 +4111,13 @@ do
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -4195,6 +4152,7 @@ done
 fi
 
 SED=$lt_cv_path_SED
+
 { echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6; }
 
@@ -4219,7 +4177,7 @@ do
   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
+    { test -f "$ac_path_GREP" && $as_test_x "$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
@@ -4301,7 +4259,7 @@ do
   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
+    { test -f "$ac_path_EGREP" && $as_test_x "$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
@@ -4556,8 +4514,8 @@ else
 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 recognize dependent libraries" >&5
+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4598,16 +4556,22 @@ cygwin*)
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -4645,7 +4609,7 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
-interix3*)
+interix[3-9]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
   ;;
@@ -4661,7 +4625,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4695,6 +4659,10 @@ osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -4782,7 +4750,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4785 "configure"' > conftest.$ac_ext
+  echo '#line 4753 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4817,7 +4785,8 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4828,6 +4797,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -4844,6 +4816,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
       ;;
     *64-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -4906,27 +4881,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   lt_cv_cc_needs_belf=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4935,7 +4894,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	lt_cv_cc_needs_belf=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5029,17 +4988,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -5073,17 +5025,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -5148,17 +5093,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -5192,17 +5130,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -5273,27 +5204,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5469,27 +5383,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -5552,27 +5449,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5608,17 +5488,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5710,7 +5583,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -5754,7 +5627,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -5867,27 +5740,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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'
-  { (case "(($ac_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
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5942,27 +5798,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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'
-  { (case "(($ac_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
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5997,27 +5836,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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'
-  { (case "(($ac_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
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -6053,27 +5875,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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'
-  { (case "(($ac_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
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -6181,6 +5986,7 @@ else
        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/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        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
@@ -6210,9 +6016,7 @@ fi
 echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
   am__fastdepCXX_TRUE=
@@ -6276,17 +6080,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -6320,17 +6117,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -6395,17 +6185,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -6439,17 +6222,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -6490,7 +6266,7 @@ 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 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort 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
@@ -6508,7 +6284,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -6534,7 +6310,7 @@ fi
 fi
 if test -z "$F77"; then
   ac_ct_F77=$F77
-  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
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort 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
@@ -6552,7 +6328,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -6659,27 +6435,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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'
-  { (case "(($ac_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
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -6722,27 +6481,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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'
-  { (case "(($ac_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
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_f77_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -6869,24 +6611,27 @@ else
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 
@@ -6903,6 +6648,7 @@ 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; }
@@ -6940,7 +6686,7 @@ hpux*) # Its linker distinguishes data from code symbols
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[ABCDGIRSTW]'
     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -7197,7 +6943,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -7237,7 +6983,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -7293,7 +7039,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -7333,7 +7079,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -7389,7 +7135,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -7429,7 +7175,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -7491,7 +7237,7 @@ test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -7691,10 +7437,10 @@ objext=o
 objext=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 
 # If no C compiler was specified, use CC.
@@ -7709,13 +7455,13 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -7735,7 +7481,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -7746,11 +7492,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:7749: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7495: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7753: \$? = $ac_status" >&5
+   echo "$as_me:7499: \$? = $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.
@@ -7801,13 +7547,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
@@ -7817,7 +7565,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -7875,7 +7623,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -7908,7 +7656,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl='-Wl,'
@@ -7927,6 +7675,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -7936,6 +7700,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -8003,7 +7771,7 @@ if test "${lt_prog_compiler_pic_works+set}" = set; then
 else
   lt_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -8014,11 +7782,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:8017: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7785: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8021: \$? = $ac_status" >&5
+   echo "$as_me:7789: \$? = $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.
@@ -8067,7 +7835,7 @@ else
   lt_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -8107,7 +7875,7 @@ else
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -8118,11 +7886,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:8121: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7889: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8125: \$? = $ac_status" >&5
+   echo "$as_me:7893: \$? = $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
@@ -8314,7 +8082,7 @@ EOF
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -8332,7 +8100,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
@@ -8347,7 +8115,7 @@ EOF
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -8365,13 +8133,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs=no
@@ -8530,7 +8307,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct=unsupported
@@ -8598,33 +8375,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -8632,7 +8400,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -8673,33 +8441,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -8707,7 +8466,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -8753,7 +8512,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes=yes
       ;;
@@ -8795,10 +8554,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -8838,7 +8597,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -8960,24 +8719,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs=no
       fi
       ;;
 
@@ -9036,17 +8799,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs=yes
       ;;
@@ -9103,7 +8865,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag='${wl}-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
@@ -9180,7 +8942,7 @@ x|xyes)
       { 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
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -9238,17 +9000,55 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -9408,12 +9208,8 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -9430,18 +9226,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -9479,7 +9263,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -9542,7 +9326,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9597,7 +9381,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9613,7 +9397,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -9626,18 +9410,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -9719,6 +9491,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -9872,6 +9648,7 @@ else
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
        else
@@ -9955,27 +9732,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9984,7 +9745,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -10066,27 +9827,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_shl_load=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10095,7 +9840,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_shl_load=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -10145,27 +9890,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_shl_load=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10174,7 +9903,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_dld_shl_load=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -10246,27 +9975,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10275,7 +9988,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -10325,27 +10038,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10354,7 +10051,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -10405,27 +10102,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_svld_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10434,7 +10115,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_svld_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -10485,27 +10166,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_dld_link=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10514,7 +10179,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_dld_dld_link=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -10570,7 +10235,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10573 "configure"
+#line 10238 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10670,7 +10335,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10673 "configure"
+#line 10338 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10868,6 +10533,7 @@ if test -f "$ltmain"; then
     module_cmds \
     module_expsym_cmds \
     lt_cv_prog_compiler_c_o \
+    fix_srcfile_path \
     exclude_expsyms \
     include_expsyms; do
 
@@ -10912,7 +10578,7 @@ echo "$as_me: creating $ofile" >&6;}
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -11236,7 +10902,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols
@@ -11405,10 +11071,10 @@ objext=o
 objext_CXX=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -11424,13 +11090,13 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -11689,7 +11355,7 @@ case $host_os in
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
+	  :
 	else
 	  # We have old collect2
 	  hardcode_direct_CXX=unsupported
@@ -11757,33 +11423,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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'
-  { (case "(($ac_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
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -11791,7 +11448,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -11833,33 +11490,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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'
-  { (case "(($ac_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
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -11867,7 +11515,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -11978,10 +11626,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -12015,7 +11663,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@ -12064,9 +11712,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_libdir_separator_CXX=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	export_dynamic_flag_spec_CXX='${wl}-E'
         ;;
@@ -12134,7 +11780,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	;;
     esac
     ;;
-  interix3*)
+  interix[3-9]*)
     hardcode_direct_CXX=no
     hardcode_shlibpath_var_CXX=no
     hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
@@ -12174,7 +11820,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator_CXX=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -12254,6 +11900,29 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  no_undefined_flag_CXX=' -zdefs'
+	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -12292,16 +11961,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ld_shlibs_CXX=no
     ;;
   openbsd*)
-    hardcode_direct_CXX=yes
-    hardcode_shlibpath_var_CXX=no
-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      export_dynamic_flag_spec_CXX='${wl}-E'
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      hardcode_direct_CXX=yes
+      hardcode_shlibpath_var_CXX=no
+      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      ld_shlibs_CXX=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -12463,15 +12136,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	case $host_os in
 	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	link_all_deplibs_CXX=yes
@@ -12518,6 +12186,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  fi
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  *)
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -12709,7 +12383,7 @@ $rm -f confest.$objext
 
 # PORTME: override above test on systems where it is broken
 case $host_os in
-interix3*)
+interix[3-9]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   predep_objects_CXX=
@@ -12717,13 +12391,46 @@ interix3*)
   postdeps_CXX=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    postdeps_CXX='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
@@ -12760,12 +12467,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # like `-m68040'.
       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -12777,7 +12486,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -12843,7 +12552,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -12886,7 +12595,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -12913,6 +12622,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -13027,7 +12744,7 @@ if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
 else
   lt_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -13038,11 +12755,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:13041: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12758: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13045: \$? = $ac_status" >&5
+   echo "$as_me:12762: \$? = $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.
@@ -13091,7 +12808,7 @@ else
   lt_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13131,7 +12848,7 @@ else
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -13142,11 +12859,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:13145: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12862: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13149: \$? = $ac_status" >&5
+   echo "$as_me:12866: \$? = $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
@@ -13212,7 +12929,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -13243,7 +12960,7 @@ x|xyes)
       { 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
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -13301,20 +13018,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -13471,12 +13175,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -13493,18 +13192,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -13542,7 +13229,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -13605,7 +13292,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13660,7 +13347,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13676,7 +13363,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -13689,18 +13376,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -13782,6 +13457,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -13976,6 +13655,7 @@ if test -f "$ltmain"; then
     module_cmds_CXX \
     module_expsym_cmds_CXX \
     lt_cv_prog_compiler_c_o_CXX \
+    fix_srcfile_path_CXX \
     exclude_expsyms_CXX \
     include_expsyms_CXX; do
 
@@ -14296,7 +13976,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
@@ -14387,10 +14067,17 @@ objext=o
 objext_F77=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -14406,13 +14093,13 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -14499,13 +14186,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
       ;;
 
@@ -14515,7 +14204,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -14573,7 +14262,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
@@ -14606,7 +14295,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_F77='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_F77='-Wl,'
@@ -14625,6 +14314,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static_F77='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -14634,6 +14339,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -14701,7 +14410,7 @@ if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
 else
   lt_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -14712,11 +14421,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:14715: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14424: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14719: \$? = $ac_status" >&5
+   echo "$as_me:14428: \$? = $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.
@@ -14765,7 +14474,7 @@ else
   lt_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -14805,7 +14514,7 @@ else
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -14816,11 +14525,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:14819: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14528: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14823: \$? = $ac_status" >&5
+   echo "$as_me:14532: \$? = $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
@@ -15012,7 +14721,7 @@ EOF
       allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -15030,7 +14739,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_F77=no
       hardcode_shlibpath_var_F77=no
       hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
@@ -15045,7 +14754,7 @@ EOF
       archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -15063,13 +14772,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs_F77=no
@@ -15228,7 +14946,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_F77=unsupported
@@ -15286,33 +15004,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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'
-  { (case "(($ac_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
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -15320,7 +15029,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -15351,33 +15060,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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'
-  { (case "(($ac_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
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -15385,7 +15085,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -15431,7 +15131,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_F77='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_F77=yes
       ;;
@@ -15473,10 +15173,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -15516,7 +15216,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
@@ -15638,24 +15338,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_F77=yes
+	hardcode_shlibpath_var_F77=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_F77='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_F77='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_F77=no
       fi
       ;;
 
@@ -15714,17 +15418,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -15781,7 +15484,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_F77='${wl}-z,text'
       archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
@@ -15858,7 +15561,7 @@ x|xyes)
       { 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
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -15916,20 +15619,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -16086,12 +15776,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -16108,18 +15793,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -16157,7 +15830,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -16220,7 +15893,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -16275,7 +15948,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -16291,7 +15964,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -16304,18 +15977,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -16397,6 +16058,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -16591,6 +16256,7 @@ if test -f "$ltmain"; then
     module_cmds_F77 \
     module_expsym_cmds_F77 \
     lt_cv_prog_compiler_c_o_F77 \
+    fix_srcfile_path_F77 \
     exclude_expsyms_F77 \
     include_expsyms_F77; do
 
@@ -16911,7 +16577,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_F77
@@ -16969,10 +16635,10 @@ objext=o
 objext_GCJ=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -16988,13 +16654,13 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -17035,7 +16701,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -17046,11 +16712,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:17049: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16715: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17053: \$? = $ac_status" >&5
+   echo "$as_me:16719: \$? = $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.
@@ -17101,13 +16767,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
       ;;
 
@@ -17117,7 +16785,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_GCJ='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -17175,7 +16843,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
@@ -17208,7 +16876,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_GCJ='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_GCJ='-Wl,'
@@ -17227,6 +16895,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static_GCJ='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -17236,6 +16920,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -17303,7 +16991,7 @@ if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
 else
   lt_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -17314,11 +17002,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:17317: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17005: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17321: \$? = $ac_status" >&5
+   echo "$as_me:17009: \$? = $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.
@@ -17367,7 +17055,7 @@ else
   lt_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17407,7 +17095,7 @@ else
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -17418,11 +17106,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:17421: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17109: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17425: \$? = $ac_status" >&5
+   echo "$as_me:17113: \$? = $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
@@ -17614,7 +17302,7 @@ EOF
       allow_undefined_flag_GCJ=unsupported
       always_export_symbols_GCJ=no
       enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -17632,7 +17320,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_GCJ=no
       hardcode_shlibpath_var_GCJ=no
       hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
@@ -17647,7 +17335,7 @@ EOF
       archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -17665,13 +17353,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs_GCJ=no
@@ -17830,7 +17527,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_GCJ=unsupported
@@ -17898,33 +17595,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -17932,7 +17620,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -17973,33 +17661,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -18007,7 +17686,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -18053,7 +17732,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_GCJ='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_GCJ=yes
       ;;
@@ -18095,10 +17774,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -18138,7 +17817,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
@@ -18260,24 +17939,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_GCJ=yes
+	hardcode_shlibpath_var_GCJ=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_GCJ='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_GCJ=no
       fi
       ;;
 
@@ -18336,17 +18019,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -18403,7 +18085,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_GCJ='${wl}-z,text'
       archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
@@ -18480,7 +18162,7 @@ x|xyes)
       { 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
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -18538,20 +18220,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -18708,12 +18377,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -18730,18 +18394,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -18779,7 +18431,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -18842,7 +18494,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18897,7 +18549,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18913,7 +18565,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -18926,18 +18578,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -19019,6 +18659,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -19213,6 +18857,7 @@ if test -f "$ltmain"; then
     module_cmds_GCJ \
     module_expsym_cmds_GCJ \
     lt_cv_prog_compiler_c_o_GCJ \
+    fix_srcfile_path_GCJ \
     exclude_expsyms_GCJ \
     include_expsyms_GCJ; do
 
@@ -19533,7 +19178,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_GCJ
@@ -19590,7 +19235,7 @@ objext=o
 objext_RC=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -19609,13 +19254,13 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -19693,6 +19338,7 @@ if test -f "$ltmain"; then
     module_cmds_RC \
     module_expsym_cmds_RC \
     lt_cv_prog_compiler_c_o_RC \
+    fix_srcfile_path_RC \
     exclude_expsyms_RC \
     include_expsyms_RC; do
 
@@ -20013,7 +19659,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_RC
@@ -20132,9 +19778,7 @@ fi
 
   { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
-
-if test $USE_MAINTAINER_MODE = yes; then
+   if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
   MAINTAINER_MODE_FALSE='#'
 else
@@ -20189,7 +19833,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -20463,8 +20107,8 @@ 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; }
+{ 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 using --disable-static-genppd!" >&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 using --disable-static-genppd!... $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
@@ -20511,7 +20155,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -20589,7 +20233,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -20666,7 +20310,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -20898,7 +20542,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -21001,7 +20645,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -21218,27 +20862,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
@@ -21263,7 +20891,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
           echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -21361,7 +20989,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -21428,7 +21056,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -21471,7 +21099,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -21585,7 +21213,9 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK2_PKG_ERRORS" >&5
 
-	HAVE_GTK2=no
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+                HAVE_GTK2=no
 	           BUILD_LIBGUTENPRINTUI2=no
 elif test $pkg_failed = untried; then
 	HAVE_GTK2=no
@@ -21660,7 +21290,9 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GIMP2_PKG_ERRORS" >&5
 
-	BUILD_GIMP2=no
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+                BUILD_GIMP2=no
 elif test $pkg_failed = untried; then
 	BUILD_GIMP2=no
 else
@@ -21977,27 +21609,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_cposix_strerror=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -22006,7 +21622,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_cposix_strerror=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -22036,7 +21652,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -22082,7 +21698,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -22122,7 +21738,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -22179,7 +21795,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -22220,7 +21836,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -22278,7 +21894,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -22322,7 +21938,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -22442,27 +22058,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -22517,27 +22116,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -22572,27 +22154,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -22628,27 +22193,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -22764,27 +22312,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
@@ -22888,6 +22419,7 @@ else
        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/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        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
@@ -22917,9 +22449,7 @@ fi
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -22952,7 +22482,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -22992,7 +22522,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -23049,7 +22579,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -23090,7 +22620,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -23148,7 +22678,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -23192,7 +22722,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -23312,27 +22842,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -23387,27 +22900,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -23442,27 +22938,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -23498,27 +22977,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -23634,27 +23096,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
@@ -23758,6 +23203,7 @@ else
        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/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        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
@@ -23787,9 +23233,7 @@ fi
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -23803,6 +23247,132 @@ fi
 
 am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
 
+if test "x$CC" != xcc; then
+  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
+else
+  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
+fi
+set dummy $CC; ac_cc=`echo $2 |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  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
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { (case "(($ac_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); } &&
+   test -f conftest2.$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
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&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_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+      rm -f conftest2.*
+      if { (case "(($ac_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); } &&
+	 test -f conftest2.$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
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+  { 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; }
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -23839,7 +23409,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 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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.
@@ -23912,7 +23482,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -23937,116 +23507,69 @@ fi
 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; }
-if test "${ac_cv_lib_fl_yywrap+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfl  $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"
+if test "x$LEX" != "x:"; then
+  cat >conftest.l <<_ACEOF
+%%
+a { ECHO; }
+b { REJECT; }
+c { yymore (); }
+d { yyless (1); }
+e { yyless (input () != 0); }
+f { unput (yytext[0]); }
+. { BEGIN INITIAL; }
+%%
+#ifdef YYTEXT_POINTER
+extern char *yytext;
 #endif
-char yywrap ();
 int
-main ()
+main (void)
 {
-return yywrap ();
-  ;
-  return 0;
+  return ! yylex () + ! yywrap ();
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+{ (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 "$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
+  (eval "$LEX conftest.l") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_fl_yywrap=yes
+  (exit $ac_status); }
+{ 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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_fl_yywrap=no
+if test -f lex.yy.c; then
+  ac_cv_prog_lex_root=lex.yy
+elif test -f lexyy.c; then
+  ac_cv_prog_lex_root=lexyy
+else
+  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-
-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; }
-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; }
-if test "${ac_cv_lib_l_yywrap+set}" = set; then
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
+echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+
+if test -z "${LEXLIB+set}"; then
+  { echo "$as_me:$LINENO: checking lex library" >&5
+echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
+if test "${ac_cv_lib_lex+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ll  $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 yywrap ();
-int
-main ()
-{
-return yywrap ();
-  ;
-  return 0;
-}
+    ac_save_LIBS=$LIBS
+    ac_cv_lib_lex='none needed'
+    for ac_lib in '' -lfl -ll; do
+      LIBS="$ac_lib $ac_save_LIBS"
+      cat >conftest.$ac_ext <<_ACEOF
+`cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
@@ -24061,85 +23584,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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_lib_l_yywrap=yes
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_lex=$ac_lib
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_l_yywrap=no
+
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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; }
-if test $ac_cv_lib_l_yywrap = yes; then
-  LEXLIB="-ll"
-fi
+      test "$ac_cv_lib_lex" != 'none needed' && break
+    done
+    LIBS=$ac_save_LIBS
 
 fi
-
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
+echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
 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; }
-if test "${ac_cv_prog_lex_root+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # The minimal lex program is just a single line: %%.  But some broken lexes
-# (Solaris, I think it was) want two %% lines, so accommodate them.
-cat >conftest.l <<_ACEOF
-%%
-%%
-_ACEOF
-{ (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); }
-if test -f lex.yy.c; then
-  ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
-  ac_cv_prog_lex_root=lexyy
-else
-  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-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; }
-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; }
@@ -24147,13 +23616,13 @@ if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
+# default is implementation-dependent.  Figure out which it is, since
 # not all implementations provide the %pointer and %array declarations.
 ac_cv_prog_lex_yytext_pointer=no
-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS=$LIBS
-LIBS="$LIBS $LEXLIB"
+LIBS="$LEXLIB $ac_save_LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#define YYTEXT_POINTER 1
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
@@ -24169,27 +23638,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_prog_lex_yytext_pointer=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -24198,10 +23651,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -24213,6 +23665,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
+rm -f conftest.l $LEX_OUTPUT_ROOT.c
 
 fi
 if test "$LEX" = :; then
@@ -24236,7 +23689,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24261,6 +23714,86 @@ fi
 done
 test -n "$YACC" || YACC="yacc"
 
+# Extract the first word of "test", so it can be a program name with args.
+set dummy test; 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_path_TEST+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $TEST in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TEST="$TEST" # Let the user override the test with a path.
+  ;;
+  *)
+  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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_TEST="$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
+TEST=$ac_cv_path_TEST
+if test -n "$TEST"; then
+  { echo "$as_me:$LINENO: result: $TEST" >&5
+echo "${ECHO_T}$TEST" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "true", so it can be a program name with args.
+set dummy true; 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_path_TRUE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $TRUE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TRUE="$TRUE" # Let the user override the test with a path.
+  ;;
+  *)
+  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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_TRUE="$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
+TRUE=$ac_cv_path_TRUE
+if test -n "$TRUE"; then
+  { echo "$as_me:$LINENO: result: $TRUE" >&5
+echo "${ECHO_T}$TRUE" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
 # 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
@@ -24279,7 +23812,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24319,7 +23852,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24359,7 +23892,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24399,7 +23932,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24445,7 +23978,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24491,7 +24024,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24537,7 +24070,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24585,7 +24118,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24634,7 +24167,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24680,7 +24213,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24726,7 +24259,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24774,7 +24307,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24819,7 +24352,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -24926,7 +24459,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -25662,27 +25195,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   gt_cv_func_gnugettext1_libc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -25691,7 +25208,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	gt_cv_func_gnugettext1_libc=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
@@ -25767,27 +25284,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   am_cv_func_iconv=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -25796,7 +25297,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
@@ -25832,27 +25333,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 else
@@ -25862,7 +25347,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
@@ -26313,27 +25798,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   gt_cv_func_gnugettext1_libintl=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -26342,7 +25811,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	gt_cv_func_gnugettext1_libintl=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
                         if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
@@ -26381,27 +25850,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 gt_cv_func_gnugettext1_libintl=yes
@@ -26413,7 +25866,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
@@ -26627,27 +26080,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
@@ -26702,27 +26138,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
@@ -26776,27 +26195,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
@@ -26850,27 +26252,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
@@ -26926,27 +26311,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
@@ -27000,27 +26368,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
@@ -27076,27 +26427,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
@@ -27152,27 +26486,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
                    cat >>confdefs.h <<\_ACEOF
@@ -27239,27 +26556,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_readline_readline=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27268,7 +26569,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_readline_readline=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -27331,27 +26632,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_readline_readline=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27360,7 +26645,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_readline_readline=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -27423,27 +26708,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_readline_readline=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27452,7 +26721,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_readline_readline=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -27515,27 +26784,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_readline_readline=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27544,7 +26797,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_readline_readline=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -27614,27 +26867,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_readline_readline=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27643,7 +26880,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_readline_readline=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -27718,27 +26955,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_ltdl_lt_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27747,7 +26968,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_ltdl_lt_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -27800,27 +27021,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27829,7 +27034,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -27882,27 +27087,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_m_pow=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27911,7 +27100,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_m_pow=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -27965,27 +27154,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_m_pow=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27994,7 +27167,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_m_pow=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -28047,27 +27220,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_z_gzgets=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28076,7 +27233,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_z_gzgets=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -28114,7 +27271,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -28184,27 +27341,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_socket_socket=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28213,7 +27354,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_socket_socket=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -28268,27 +27409,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_nsl_gethostbyaddr=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28297,7 +27422,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_nsl_gethostbyaddr=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -28345,27 +27470,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28401,17 +27509,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28516,27 +27617,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_ssl_SSL_new=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28545,7 +27630,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_ssl_SSL_new=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -28607,27 +27692,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_cups_cupsPrintFiles=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28636,7 +27705,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_cups_cupsPrintFiles=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -28693,27 +27762,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_cupsimage_cupsRasterOpen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -28722,7 +27775,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_cupsimage_cupsRasterOpen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -28812,7 +27865,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -29028,27 +28081,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
@@ -29073,7 +28110,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
           echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -29157,7 +28194,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -29373,27 +28410,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
@@ -29418,7 +28439,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
           echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -29499,7 +28520,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -29713,27 +28734,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
           echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
@@ -29758,7 +28763,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
           echo "*** may want to edit the glib-config script: $GLIB_CONFIG"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -29832,7 +28837,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -30074,27 +29079,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    echo "*** The test program compiled, but did not run. This usually means that"
           echo "*** the run-time linker is not finding GIMP 1.2 or is finding the wrong"
           echo "*** version of GIMP.  If it is not finding GIMP 1.2, you'll need to set"
@@ -30116,7 +29105,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
           echo "*** gimptool script: $GIMPTOOL"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -30202,27 +29191,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30395,27 +29367,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30451,17 +29406,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30559,27 +29507,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30615,17 +29546,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30735,27 +29659,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30791,17 +29698,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30904,27 +29804,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -30960,17 +29843,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31073,27 +29949,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31129,17 +29988,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31242,27 +30094,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31298,17 +30133,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31411,27 +30239,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31467,17 +30278,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31582,27 +30386,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31638,17 +30425,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31752,27 +30532,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31808,17 +30571,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31921,27 +30677,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -31977,17 +30716,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -32090,27 +30822,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -32146,17 +30861,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -32240,10 +30948,10 @@ main ()
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
-  const charset x;
+  const charset cs;
   /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
+  char const *const *pcpcc;
+  char **ppc;
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
@@ -32252,11 +30960,11 @@ main ()
      an arm of an if-expression whose if-part is not a constant
      expression */
   const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
+  pcpcc = &g + (g ? g-g : 0);
   /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
   { /* SCO 3.2v4 cc rejects this.  */
     char *t;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
@@ -32283,7 +30991,7 @@ main ()
     const int foo = 10;
     if (!foo) return 0;
   }
-  return !x[0] && !zero.x;
+  return !cs[0] && !zero.x;
 #endif
 
   ;
@@ -32303,27 +31011,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -32377,27 +31068,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_inline=$ac_kw
 else
   echo "$as_me: failed program was:" >&5
@@ -32467,27 +31141,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_off_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -32547,27 +31204,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_size_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -32625,27 +31265,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_signal=int
 else
   echo "$as_me: failed program was:" >&5
@@ -32734,27 +31357,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -32763,7 +31370,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -32844,27 +31451,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -32873,7 +31464,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -32936,27 +31527,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_finite=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -32965,7 +31540,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_finite+set}" = set; then
   break
@@ -32988,9 +31563,7 @@ if test "$ac_res" != no; then
 fi
 
 
-
-
-if test x${BUILD_FOOMATIC} = xyes; then
+ if test x${BUILD_FOOMATIC} = xyes; then
   BUILD_FOOMATIC_TRUE=
   BUILD_FOOMATIC_FALSE='#'
 else
@@ -32999,9 +31572,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_FOOMATIC_3} = xyes; then
+ if test x${BUILD_FOOMATIC_3} = xyes; then
   BUILD_FOOMATIC_3_TRUE=
   BUILD_FOOMATIC_3_FALSE='#'
 else
@@ -33010,9 +31581,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_GHOSTSCRIPT} = xyes; then
+ if test x${BUILD_GHOSTSCRIPT} = xyes; then
   BUILD_GHOSTSCRIPT_TRUE=
   BUILD_GHOSTSCRIPT_FALSE='#'
 else
@@ -33021,9 +31590,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_CUPS} = xyes; then
+ if test x${BUILD_CUPS} = xyes; then
   BUILD_CUPS_TRUE=
   BUILD_CUPS_FALSE='#'
 else
@@ -33032,9 +31599,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_CUPS_1_2} = xyes; then
+ if test x${BUILD_CUPS_1_2} = xyes; then
   BUILD_CUPS_1_2_TRUE=
   BUILD_CUPS_1_2_FALSE='#'
 else
@@ -33043,9 +31608,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_CUPS_PPDS} = xyes; then
+ if test x${BUILD_CUPS_PPDS} = xyes; then
   BUILD_CUPS_PPDS_TRUE=
   BUILD_CUPS_PPDS_FALSE='#'
 else
@@ -33054,9 +31617,7 @@ else
 fi
 
 
-
-
-if test x${CUPS_PPDS_AT_TOP_LEVEL} = xyes; then
+ if test x${CUPS_PPDS_AT_TOP_LEVEL} = xyes; then
   CUPS_PPDS_AT_TOP_LEVEL_TRUE=
   CUPS_PPDS_AT_TOP_LEVEL_FALSE='#'
 else
@@ -33065,9 +31626,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_TRANSLATED_CUPS_PPDS} = xyes; then
+ if test x${BUILD_TRANSLATED_CUPS_PPDS} = xyes; then
   BUILD_TRANSLATED_CUPS_PPDS_TRUE=
   BUILD_TRANSLATED_CUPS_PPDS_FALSE='#'
 else
@@ -33076,9 +31635,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_SIMPLIFIED_CUPS_PPDS} = xyes; then
+ if test x${BUILD_SIMPLIFIED_CUPS_PPDS} = xyes; then
   BUILD_SIMPLIFIED_CUPS_PPDS_TRUE=
   BUILD_SIMPLIFIED_CUPS_PPDS_FALSE='#'
 else
@@ -33093,9 +31650,7 @@ else
   CUPS_PPD_PS_LEVEL=3
 fi
 
-
-
-if test x${USE_LEVEL3_PS} = xyes; then
+ if test x${USE_LEVEL3_PS} = xyes; then
   USE_LEVEL3_PS_TRUE=
   USE_LEVEL3_PS_FALSE='#'
 else
@@ -33104,9 +31659,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_ESCPUTIL} = xyes; then
+ if test x${BUILD_ESCPUTIL} = xyes; then
   BUILD_ESCPUTIL_TRUE=
   BUILD_ESCPUTIL_FALSE='#'
 else
@@ -33115,9 +31668,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_TEST} = xyes; then
+ if test x${BUILD_TEST} = xyes; then
   BUILD_TEST_TRUE=
   BUILD_TEST_FALSE='#'
 else
@@ -33126,9 +31677,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_TESTPATTERN} = xyes; then
+ if test x${BUILD_TESTPATTERN} = xyes; then
   BUILD_TESTPATTERN_TRUE=
   BUILD_TESTPATTERN_FALSE='#'
 else
@@ -33137,9 +31686,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_LIBGUTENPRINTUI} = xyes; then
+ if test x${BUILD_LIBGUTENPRINTUI} = xyes; then
   BUILD_LIBGUTENPRINTUI_TRUE=
   BUILD_LIBGUTENPRINTUI_FALSE='#'
 else
@@ -33148,9 +31695,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_LIBGUTENPRINTUI2} = xyes; then
+ if test x${BUILD_LIBGUTENPRINTUI2} = xyes; then
   BUILD_LIBGUTENPRINTUI2_TRUE=
   BUILD_LIBGUTENPRINTUI2_FALSE='#'
 else
@@ -33159,9 +31704,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_GIMP} = xyes; then
+ if test x${BUILD_GIMP} = xyes; then
   BUILD_GIMP_TRUE=
   BUILD_GIMP_FALSE='#'
 else
@@ -33170,9 +31713,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_GIMP2} = xyes; then
+ if test x${BUILD_GIMP2} = xyes; then
   BUILD_GIMP2_TRUE=
   BUILD_GIMP2_FALSE='#'
 else
@@ -33181,9 +31722,7 @@ else
 fi
 
 
-
-
-if test x${BUILD_GIMP2_AS_GUTENPRINT} = xyes; then
+ if test x${BUILD_GIMP2_AS_GUTENPRINT} = xyes; then
   BUILD_GIMP2_AS_GUTENPRINT_TRUE=
   BUILD_GIMP2_AS_GUTENPRINT_FALSE='#'
 else
@@ -33192,9 +31731,7 @@ else
 fi
 
 
-
-
-if test x${INSTALL_SAMPLES} = xyes; then
+ if test x${INSTALL_SAMPLES} = xyes; then
   INSTALL_SAMPLES_TRUE=
   INSTALL_SAMPLES_FALSE='#'
 else
@@ -33203,9 +31740,7 @@ else
 fi
 
 
-
-
-if test x${INSTALL_USER_GUIDE} = xyes; then
+ if test x${INSTALL_USER_GUIDE} = xyes; then
   INSTALL_USER_GUIDE_TRUE=
   INSTALL_USER_GUIDE_FALSE='#'
 else
@@ -33267,9 +31802,7 @@ else
 fi
 
 
-
-
-if test x${USE_NLS} = xyes; then
+ if test x${USE_NLS} = xyes; then
   USE_NLS_TRUE=
   USE_NLS_FALSE='#'
 else
@@ -33347,9 +31880,7 @@ else
   { echo "$as_me:$LINENO: result: static" >&5
 echo "${ECHO_T}static" >&6; }
 fi
-
-
-if test x$MODULE = xtrue; then
+ if test x$MODULE = xtrue; then
   BUILD_MODULES_TRUE=
   BUILD_MODULES_FALSE='#'
 else
@@ -33358,9 +31889,7 @@ else
 fi
 
 
-
-
-if test x"$STATIC_GENPPD" = xyes; then
+ if test x"$STATIC_GENPPD" = xyes; then
   BUILD_GENPPD_STATIC_TRUE=
   BUILD_GENPPD_STATIC_FALSE='#'
 else
@@ -33404,7 +31933,7 @@ cat >>confdefs.h <<_ACEOF
 #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL}
 _ACEOF
 
-RELEASE_DATE="17 Jun 2007"
+RELEASE_DATE="01 Jan 2008"
 
 cat >>confdefs.h <<_ACEOF
 #define RELEASE_DATE "${RELEASE_DATE}"
@@ -33522,6 +32051,8 @@ ac_config_files="$ac_config_files src/foomatic/mk_printerlist"
 
 ac_config_files="$ac_config_files src/testpattern/run-testpattern-2"
 
+ac_config_files="$ac_config_files src/cups/test-rastertogutenprint"
+
 ac_config_files="$ac_config_files src/ghost/Makefile"
 
 ac_config_files="$ac_config_files src/testpattern/Makefile"
@@ -33876,7 +32407,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -33885,10 +32417,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  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
@@ -34112,19 +32647,28 @@ else
   as_mkdir_p=false
 fi
 
-# 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"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # 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'"
@@ -34139,8 +32683,8 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # 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
+This file was extended by gutenprint $as_me 5.0.2, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -34169,7 +32713,7 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -34192,8 +32736,8 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gutenprint config.status 5.0.1
-configured by $0, generated by GNU Autoconf 2.60,
+gutenprint config.status 5.0.2
+configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
@@ -34203,6 +32747,7 @@ gives unlimited permission to copy, distribute and modify it."
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -34345,6 +32890,7 @@ do
     "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/cups/test-rastertogutenprint") CONFIG_FILES="$CONFIG_FILES src/cups/test-rastertogutenprint" ;;
     "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" ;;
@@ -34473,6 +33019,7 @@ 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
+am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 PACKAGE!$PACKAGE$ac_delim
 VERSION!$VERSION$ac_delim
@@ -34516,7 +33063,6 @@ 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
@@ -34558,6 +33104,8 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+SED!$SED$ac_delim
+GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 LN_S!$LN_S$ac_delim
 ECHO!$ECHO$ac_delim
@@ -34594,10 +33142,12 @@ 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
+LEXLIB!$LEXLIB$ac_delim
 YACC!$YACC$ac_delim
 YFLAGS!$YFLAGS$ac_delim
+TEST!$TEST$ac_delim
+TRUE!$TRUE$ac_delim
 FIND!$FIND$ac_delim
 PERL!$PERL$ac_delim
 GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim
@@ -34651,10 +33201,6 @@ 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
@@ -34696,6 +33242,10 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+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
 BUILD_ESCPUTIL_FALSE!$BUILD_ESCPUTIL_FALSE$ac_delim
 BUILD_TEST_TRUE!$BUILD_TEST_TRUE$ac_delim
 BUILD_TEST_FALSE!$BUILD_TEST_FALSE$ac_delim
@@ -34768,7 +33318,7 @@ 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
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -34995,6 +33545,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -35048,6 +33603,7 @@ 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
+s&@MKDIR_P@&$ac_MKDIR_P&;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
 
@@ -35212,8 +33768,9 @@ echo "$as_me: executing $ac_file commands" >&6;}
   # 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
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
@@ -35425,13 +33982,16 @@ done
     done ;;
     "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} ;;
+		 mv src/cups/cups-genppdconfig src/cups/cups-genppdconfig.${GUTENPRINT_RELEASE_VERSION};
+		 echo "    *** Ignore any warning that may follow that sed can't read src/cups/cups-genppdconfig" ;;
     "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} ;;
+		 mv src/cups/cups-genppdupdate src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION};
+		 echo "    *** Ignore any warning that may follow that sed can't read src/cups/cups-genppdupdate" ;;
     "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 ;;
+    "src/cups/test-rastertogutenprint":F) chmod +x src/cups/test-rastertogutenprint ;;
     "default":C)
 echo
  ;;
@@ -35511,7 +34071,7 @@ if test "$BUILD_FOOMATIC" != "no" ; then
     echo "        Build Foomatic 3.x data:                $BUILD_FOOMATIC_3"
 fi
 if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != "no" ; then
-    echo "    Build enhanced Print plugin for the GIMP:   yes"
+    echo "    Build enhanced Print plugin for GIMP:       yes"
     echo "        Build GIMP 1.2 plugin:                  $BUILD_GIMP"
     echo "        Build GIMP 2.x plugin:                  $BUILD_GIMP2"
     if test "$BUILD_GIMP2" != "no" ; then
@@ -35523,7 +34083,7 @@ if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != "no" ; then
     fi
     echo "        Install plugin(s) in home directory:    $USER_INSTALL"
 else
-    echo "    Build enhanced Print plugin for the GIMP:   no"
+    echo "    Build enhanced Print plugin for GIMP:       no"
 fi
 echo "    Build EPSON Stylus utility:                 $BUILD_ESCPUTIL"
 echo "    Build test programs:                        $BUILD_TEST"
diff --git a/configure.ac b/configure.ac
index 576a171..6be334f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.151.2.2 2007/05/29 01:47:26 rlk Exp $
+dnl $Id: configure.ac,v 1.151.2.5 2007/12/29 20:46:10 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],     [1])
+pushdef([GUTENPRINT_MICRO_VERSION],     [2])
 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.151.2.2 $)
+AC_REVISION($Revision: 1.151.2.5 $)
 AC_CONFIG_SRCDIR(src/main/print-vars.c)
 AC_CONFIG_AUX_DIR(scripts)
 STP_INIT
@@ -281,7 +281,7 @@ STP_ARG_ENABLE([cups-level3-ppds],
 
 STATIC_GENPPD="$enable_static"
 STP_ARG_ENABLE([static-genppd],
-               [build a statically-linked cups-genppd and rastertogutenprint.  WARNING: Please read the README and NEWS (release notes) CAREFULLY before disabling this!],
+               [build a statically-linked cups-genppd and rastertogutenprint.  WARNING: Please read the README and NEWS (release notes) CAREFULLY before using --disable-static-genppd!],
 	       [STATIC_GENPPD],
 	       [(automatic)])
 
@@ -502,10 +502,13 @@ AC_ISC_POSIX
 AC_PROG_AWK
 AC_PROG_CC
 AM_PROG_CC_STDC
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AM_PROG_LEX
 AC_PROG_YACC
+AC_PATH_PROG([TEST], [test])
+AC_PATH_PROG([TRUE], [true])
 AC_PATH_PROG([FIND], [find])
 AC_PATH_PROG([PERL], [perl])
 AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
@@ -1012,11 +1015,13 @@ AC_CONFIG_FILES([src/cups/Makefile])
 AC_CONFIG_FILES([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}])
+		 mv src/cups/cups-genppdconfig src/cups/cups-genppdconfig.${GUTENPRINT_RELEASE_VERSION};
+		 echo "    *** Ignore any warning that may follow that sed can't read src/cups/cups-genppdconfig"])
 AC_CONFIG_FILES([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}])
+		 mv src/cups/cups-genppdupdate src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION};
+		 echo "    *** Ignore any warning that may follow that sed can't read src/cups/cups-genppdupdate"])
 AC_CONFIG_FILES([src/escputil/Makefile])
 AC_CONFIG_FILES([src/foomatic/Makefile])
 AC_CONFIG_FILES([src/foomatic/foomatic-generator],
@@ -1025,6 +1030,8 @@ AC_CONFIG_FILES([src/foomatic/mk_printerlist],
                 [chmod +x src/foomatic/mk_printerlist])
 AC_CONFIG_FILES([src/testpattern/run-testpattern-2],
                 [chmod +x src/testpattern/run-testpattern-2])
+AC_CONFIG_FILES([src/cups/test-rastertogutenprint],
+                [chmod +x src/cups/test-rastertogutenprint])
 AC_CONFIG_FILES([src/ghost/Makefile])
 AC_CONFIG_FILES([src/testpattern/Makefile])
 AC_CONFIG_FILES([src/gimp/Makefile])
@@ -1088,7 +1095,7 @@ if test "$BUILD_FOOMATIC" != "no" ; then
     echo "        Build Foomatic 3.x data:                $BUILD_FOOMATIC_3"
 fi
 if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != "no" ; then
-    echo "    Build enhanced Print plugin for the GIMP:   yes"
+    echo "    Build enhanced Print plugin for GIMP:       yes"
     echo "        Build GIMP 1.2 plugin:                  $BUILD_GIMP"
     echo "        Build GIMP 2.x plugin:                  $BUILD_GIMP2"
     if test "$BUILD_GIMP2" != "no" ; then
@@ -1100,7 +1107,7 @@ if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != "no" ; then
     fi
     echo "        Install plugin(s) in home directory:    $USER_INSTALL"
 else
-    echo "    Build enhanced Print plugin for the GIMP:   no"
+    echo "    Build enhanced Print plugin for GIMP:       no"
 fi
 echo "    Build EPSON Stylus utility:                 $BUILD_ESCPUTIL"
 echo "    Build test programs:                        $BUILD_TEST"
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b73fbf6..f06e872 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -18,15 +18,11 @@
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -62,61 +58,26 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -126,8 +87,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -208,14 +167,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -235,9 +191,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -256,27 +211,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -288,6 +242,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -333,8 +288,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = developer
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 MAINTAINERCLEANFILES = \
@@ -396,10 +354,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -431,8 +385,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -533,23 +486,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -563,7 +514,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -571,6 +522,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -611,8 +564,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -624,12 +576,20 @@ info-am:
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -645,23 +605,25 @@ pdf-am:
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \
-	check-am clean clean-generic clean-libtool clean-recursive \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-recursive distclean-tags distdir \
-	dvi dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am all-local check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive distclean \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-local maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am
+	maintainer-clean-local mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 
 @SET_MAKE@
diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in
index bc8612f..addd7ee 100644
--- a/doc/developer/Makefile.in
+++ b/doc/developer/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -18,15 +18,11 @@
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -62,51 +58,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -116,8 +74,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -198,14 +154,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -225,9 +178,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -246,27 +198,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -278,6 +229,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -323,8 +275,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 MANUAL_SRC_FILES = \
 	copying.xml \
@@ -393,10 +348,6 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -405,23 +356,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -470,7 +419,7 @@ clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -482,12 +431,20 @@ info-am:
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -505,19 +462,22 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
 	clean-libtool clean-local dist-hook distclean \
 	distclean-generic distclean-libtool distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-local
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic maintainer-clean-local mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-local
 
 
 @SET_MAKE@
diff --git a/doc/developer/gutenprint.pdf b/doc/developer/gutenprint.pdf
index e46f495..04d397d 100644
--- a/doc/developer/gutenprint.pdf
+++ b/doc/developer/gutenprint.pdf
diff --git a/doc/gutenprint/gutenprint.tag b/doc/gutenprint/gutenprint.tag
index d55549e..1ff63e4 100644
--- a/doc/gutenprint/gutenprint.tag
+++ b/doc/gutenprint/gutenprint.tag
@@ -6,7 +6,7 @@
     <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>
+      <type>struct stp_array</type>
       <name>stp_array_t</name>
       <anchorfile>group__array.html</anchorfile>
       <anchor>g26a474575a39c1c36ad520b95aa813b0</anchor>
@@ -343,14 +343,7 @@
     <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>
-    <member kind="typedef">
-      <type>stp_color</type>
-      <name>stp_color_t</name>
-      <anchorfile>group__color.html</anchorfile>
-      <anchor>gd1408f9835b72f266ec7c7e1e1202a74</anchor>
-      <arglist></arglist>
-    </member>
+    <class kind="struct">stp_color_t</class>
     <member kind="function">
       <type>int</type>
       <name>stp_color_init</name>
@@ -541,7 +534,7 @@
     <includes id="sequence_8h" name="sequence.h" local="no" imported="no">gutenprint/sequence.h</includes>
     <class kind="struct">stp_curve_point_t</class>
     <member kind="typedef">
-      <type>stp_curve</type>
+      <type>struct stp_curve</type>
       <name>stp_curve_t</name>
       <anchorfile>group__curve.html</anchorfile>
       <anchor>g375a2b23705fb0698ae1d823243c8524</anchor>
@@ -944,12 +937,12 @@
     <name>dither.h</name>
     <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>
-    <class kind="struct">stp_dither_matrix_generic</class>
-    <class kind="struct">dither_matrix_impl</class>
-    <class kind="struct">stp_dotsize</class>
-    <class kind="struct">stp_shade</class>
+    <class kind="struct">stp_dither_matrix_short_t</class>
+    <class kind="struct">stp_dither_matrix_normal_t</class>
+    <class kind="struct">stp_dither_matrix_generic_t</class>
+    <class kind="struct">stp_dither_matrix_impl_t</class>
+    <class kind="struct">stp_dotsize_t</class>
+    <class kind="struct">stp_shade_t</class>
     <member kind="define">
       <type>#define</type>
       <name>STP_ECOLOR_K</name>
@@ -985,48 +978,6 @@
       <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>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>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>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>f823fed10cb9591c0e659033ec49f55f</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="typedef">
-      <type>stp_dotsize</type>
-      <name>stp_dotsize_t</name>
-      <anchorfile>dither_8h.html</anchorfile>
-      <anchor>7a74b9371fd47b48d961d2316e2126e4</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="typedef">
-      <type>stp_shade</type>
-      <name>stp_shade_t</name>
-      <anchorfile>dither_8h.html</anchorfile>
-      <anchor>5baefb325bf92b7ca10c2d057c04b835</anchor>
-      <arglist></arglist>
-    </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_iterated_init</name>
@@ -1497,7 +1448,7 @@
     <name>image.h</name>
     <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>image_8h</filename>
-    <class kind="struct">stp_image</class>
+    <class kind="struct">stp_image_t</class>
     <member kind="define">
       <type>#define</type>
       <name>STP_CHANNEL_LIMIT</name>
@@ -1505,13 +1456,6 @@
       <anchor>g0b7daa7e9e9b26fea847d71ca9de7c02</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
-      <type>stp_image</type>
-      <name>stp_image_t</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>gae0b5ef92b619849a51cb75d376a90fb</anchor>
-      <arglist></arglist>
-    </member>
     <member kind="enumeration">
       <name>stp_image_status_t</name>
       <anchor>g58672e1989d582c14328048b207657c8</anchor>
@@ -1582,46 +1526,46 @@
     <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>list_8h</filename>
     <member kind="typedef">
-      <type>stp_list_item</type>
+      <type>struct stp_list_item</type>
       <name>stp_list_item_t</name>
       <anchorfile>group__list.html</anchorfile>
       <anchor>g67b4fafe1ab6ead5be7500f88874bdb0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
-      <type>stp_list</type>
+      <type>struct stp_list</type>
       <name>stp_list_t</name>
       <anchorfile>group__list.html</anchorfile>
       <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>g4102fc776ec5bbd84eb589cfba97dfc2</anchor>
-      <arglist>(void *)</arglist>
+      <anchor>gc09ea139ad36a6e21f30755439afeab5</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>g846d759413f07e91bed397f1fe3224d1</anchor>
-      <arglist>(const void *)</arglist>
+      <anchor>g8d8084abc24eb4b00290916d5ff44c1f</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>g7ecf51e54538837d4e0804da3ce58f12</anchor>
-      <arglist>(const void *)</arglist>
+      <anchor>g815993ed02f7e9c7b5cb4680f0504d97</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>gd12571e44981e7acd62137c83652121a</anchor>
-      <arglist>(const void *, const void *)</arglist>
+      <anchor>ge5c7167d6fc957fee0b6aff45bc0b126</anchor>
+      <arglist>)(const void *, const void *)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
@@ -1811,22 +1755,8 @@
     <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>
-    <class kind="struct">stp_module</class>
-    <member kind="typedef">
-      <type>stp_module_version</type>
-      <name>stp_module_version_t</name>
-      <anchorfile>module_8h.html</anchorfile>
-      <anchor>753a8450e5ac6b73134c12b89533f16e</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="typedef">
-      <type>stp_module</type>
-      <name>stp_module_t</name>
-      <anchorfile>module_8h.html</anchorfile>
-      <anchor>e1e92953e8ffaa00cfbf7fc01e51f36d</anchor>
-      <arglist></arglist>
-    </member>
+    <class kind="struct">stp_module_version_t</class>
+    <class kind="struct">stp_module_t</class>
     <member kind="enumeration">
       <name>stp_module_class_t</name>
       <anchor>b3da7c3525c26e1d63d7fe1f95da5a42</anchor>
@@ -1904,10 +1834,10 @@
     <name>mxml.h</name>
     <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>
-    <class kind="struct">stp_mxml_text_s</class>
-    <class kind="union">stp_mxml_value_u</class>
+    <class kind="struct">stp_mxml_attr_t</class>
+    <class kind="struct">stp_mxml_element_t</class>
+    <class kind="struct">stp_mxml_text_t</class>
+    <class kind="union">stp_mxml_value_t</class>
     <class kind="struct">stp_mxml_node_s</class>
     <member kind="define">
       <type>#define</type>
@@ -2015,35 +1945,7 @@
       <arglist></arglist>
     </member>
     <member kind="typedef">
-      <type>stp_mxml_attr_s</type>
-      <name>stp_mxml_attr_t</name>
-      <anchorfile>mxml_8h.html</anchorfile>
-      <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>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>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>9a2e2ffccac3c73524e76f3e816d35bf</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="typedef">
-      <type>stp_mxml_node_s</type>
+      <type>struct stp_mxml_node_s</type>
       <name>stp_mxml_node_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
       <anchor>8fb80a78e3ac8d8aa9eb14c35326bd82</anchor>
@@ -2296,24 +2198,18 @@
     <name>printers.h</name>
     <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>printers_8h</filename>
+    <includes id="string-list_8h" name="string-list.h" local="no" imported="no">gutenprint/string-list.h</includes>
     <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>
     <class kind="struct">stp_printfuncs_t</class>
-    <class kind="struct">stp_family</class>
+    <class kind="struct">stp_family_t</class>
     <member kind="typedef">
-      <type>stp_printer</type>
+      <type>struct stp_printer</type>
       <name>stp_printer_t</name>
       <anchorfile>group__printer.html</anchorfile>
       <anchor>gcddc2ce7fa4e0a68fcc30c123503738f</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
-      <type>stp_family</type>
-      <name>stp_family_t</name>
-      <anchorfile>group__printer.html</anchorfile>
-      <anchor>g66a5e7cf2b1743a46bd78cb851e1d0a4</anchor>
-      <arglist></arglist>
-    </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_model_count</name>
@@ -2427,6 +2323,13 @@
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_get_external_options</name>
+      <anchorfile>group__printer.html</anchorfile>
+      <anchor>gae7a50e6175eed1b84d2e20c924b33ca</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
       <type>int</type>
       <name>stp_get_model_id</name>
       <anchorfile>group__printer.html</anchorfile>
@@ -2488,7 +2391,7 @@
     <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>sequence_8h</filename>
     <member kind="typedef">
-      <type>stp_sequence</type>
+      <type>struct stp_sequence</type>
       <name>stp_sequence_t</name>
       <anchorfile>group__sequence.html</anchorfile>
       <anchor>g327a46aa1d782a4cd53abf306068e272</anchor>
@@ -2697,7 +2600,7 @@
     <filename>string-list_8h</filename>
     <class kind="struct">stp_param_string_t</class>
     <member kind="typedef">
-      <type>stp_string_list</type>
+      <type>struct stp_string_list</type>
       <name>stp_string_list_t</name>
       <anchorfile>string-list_8h.html</anchorfile>
       <anchor>5e3b69c7c2eca2523184cce51ca26543</anchor>
@@ -2936,6 +2839,13 @@
     </member>
     <member kind="define">
       <type>#define</type>
+      <name>STP_DBG_PPD</name>
+      <anchorfile>group__util.html</anchorfile>
+      <anchor>gb3c2a0be5bea6ef42b720eabde62cd44</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
       <name>STP_SAFE_FREE</name>
       <anchorfile>group__util.html</anchorfile>
       <anchor>ga5a86efbbd3e2eb391718d82a1d7ffcc</anchor>
@@ -3206,7 +3116,7 @@
       <arglist>(x)</arglist>
     </member>
     <member kind="typedef">
-      <type>stp_vars</type>
+      <type>struct stp_vars</type>
       <name>stp_vars_t</name>
       <anchorfile>group__vars.html</anchorfile>
       <anchor>g2d49c94847d18d8b62a214995b14680f</anchor>
@@ -3227,28 +3137,28 @@
       <arglist></arglist>
     </member>
     <member kind="typedef">
-      <type>void(*)</type>
+      <type>void(*</type>
       <name>stp_outfunc_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g6922054c644d73006bff95a8ad268a1a</anchor>
-      <arglist>(void *data, const char *buffer, size_t bytes)</arglist>
+      <anchor>g268c87919653380a22b1f69c78fe6555</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>g4541229554178e84408cccd89f532cb0</anchor>
-      <arglist>(void *)</arglist>
+      <anchor>g25e6aec21fd8f8a65c4c4086d0f3dec0</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>g7974f89cff4cbb5b225d0c4fbb92e9bb</anchor>
-      <arglist>(void *)</arglist>
+      <anchor>g1ac9aa4c059fbb52307d8522a5f1dc6d</anchor>
+      <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
-      <type>stp_compdata</type>
+      <type>struct stp_compdata</type>
       <name>compdata_t</name>
       <anchorfile>group__vars.html</anchorfile>
       <anchor>g4d45b95baae036143e14adfc0014f562</anchor>
@@ -4500,11 +4410,11 @@
     <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>68816020e4f2e76d9b87379fe5b5edb2</anchor>
-      <arglist>(stp_mxml_node_t *node, const char *file)</arglist>
+      <anchor>fad8ff906c4248935a93794f1b6f8c1a</anchor>
+      <arglist>)(stp_mxml_node_t *node, const char *file)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
@@ -4659,7 +4569,7 @@
     <title>array</title>
     <filename>group__array.html</filename>
     <member kind="typedef">
-      <type>stp_array</type>
+      <type>struct stp_array</type>
       <name>stp_array_t</name>
       <anchorfile>group__array.html</anchorfile>
       <anchor>g26a474575a39c1c36ad520b95aa813b0</anchor>
@@ -4748,14 +4658,7 @@
     <title>color</title>
     <filename>group__color.html</filename>
     <class kind="struct">stp_colorfuncs_t</class>
-    <class kind="struct">stp_color</class>
-    <member kind="typedef">
-      <type>stp_color</type>
-      <name>stp_color_t</name>
-      <anchorfile>group__color.html</anchorfile>
-      <anchor>gd1408f9835b72f266ec7c7e1e1202a74</anchor>
-      <arglist></arglist>
-    </member>
+    <class kind="struct">stp_color_t</class>
     <member kind="function">
       <type>int</type>
       <name>stp_color_init</name>
@@ -4847,7 +4750,7 @@
     <filename>group__curve.html</filename>
     <class kind="struct">stp_curve_point_t</class>
     <member kind="typedef">
-      <type>stp_curve</type>
+      <type>struct stp_curve</type>
       <name>stp_curve_t</name>
       <anchorfile>group__curve.html</anchorfile>
       <anchor>g375a2b23705fb0698ae1d823243c8524</anchor>
@@ -5461,7 +5364,7 @@
     <name>image</name>
     <title>image</title>
     <filename>group__image.html</filename>
-    <class kind="struct">stp_image</class>
+    <class kind="struct">stp_image_t</class>
     <member kind="define">
       <type>#define</type>
       <name>STP_CHANNEL_LIMIT</name>
@@ -5469,13 +5372,6 @@
       <anchor>g0b7daa7e9e9b26fea847d71ca9de7c02</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
-      <type>stp_image</type>
-      <name>stp_image_t</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>gae0b5ef92b619849a51cb75d376a90fb</anchor>
-      <arglist></arglist>
-    </member>
     <member kind="enumeration">
       <name>stp_image_status_t</name>
       <anchor>g58672e1989d582c14328048b207657c8</anchor>
@@ -5546,46 +5442,46 @@
     <title>list</title>
     <filename>group__list.html</filename>
     <member kind="typedef">
-      <type>stp_list_item</type>
+      <type>struct stp_list_item</type>
       <name>stp_list_item_t</name>
       <anchorfile>group__list.html</anchorfile>
       <anchor>g67b4fafe1ab6ead5be7500f88874bdb0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
-      <type>stp_list</type>
+      <type>struct stp_list</type>
       <name>stp_list_t</name>
       <anchorfile>group__list.html</anchorfile>
       <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>g4102fc776ec5bbd84eb589cfba97dfc2</anchor>
-      <arglist>(void *)</arglist>
+      <anchor>gc09ea139ad36a6e21f30755439afeab5</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>g846d759413f07e91bed397f1fe3224d1</anchor>
-      <arglist>(const void *)</arglist>
+      <anchor>g8d8084abc24eb4b00290916d5ff44c1f</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>g7ecf51e54538837d4e0804da3ce58f12</anchor>
-      <arglist>(const void *)</arglist>
+      <anchor>g815993ed02f7e9c7b5cb4680f0504d97</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>gd12571e44981e7acd62137c83652121a</anchor>
-      <arglist>(const void *, const void *)</arglist>
+      <anchor>ge5c7167d6fc957fee0b6aff45bc0b126</anchor>
+      <arglist>)(const void *, const void *)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
@@ -5841,21 +5737,14 @@
     <title>printer</title>
     <filename>group__printer.html</filename>
     <class kind="struct">stp_printfuncs_t</class>
-    <class kind="struct">stp_family</class>
+    <class kind="struct">stp_family_t</class>
     <member kind="typedef">
-      <type>stp_printer</type>
+      <type>struct stp_printer</type>
       <name>stp_printer_t</name>
       <anchorfile>group__printer.html</anchorfile>
       <anchor>gcddc2ce7fa4e0a68fcc30c123503738f</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
-      <type>stp_family</type>
-      <name>stp_family_t</name>
-      <anchorfile>group__printer.html</anchorfile>
-      <anchor>g66a5e7cf2b1743a46bd78cb851e1d0a4</anchor>
-      <arglist></arglist>
-    </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_model_count</name>
@@ -5969,6 +5858,13 @@
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_get_external_options</name>
+      <anchorfile>group__printer.html</anchorfile>
+      <anchor>gae7a50e6175eed1b84d2e20c924b33ca</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
       <type>int</type>
       <name>stp_get_model_id</name>
       <anchorfile>group__printer.html</anchorfile>
@@ -6030,7 +5926,7 @@
     <title>sequence</title>
     <filename>group__sequence.html</filename>
     <member kind="typedef">
-      <type>stp_sequence</type>
+      <type>struct stp_sequence</type>
       <name>stp_sequence_t</name>
       <anchorfile>group__sequence.html</anchorfile>
       <anchor>g327a46aa1d782a4cd53abf306068e272</anchor>
@@ -6386,6 +6282,13 @@
     </member>
     <member kind="define">
       <type>#define</type>
+      <name>STP_DBG_PPD</name>
+      <anchorfile>group__util.html</anchorfile>
+      <anchor>gb3c2a0be5bea6ef42b720eabde62cd44</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
       <name>STP_SAFE_FREE</name>
       <anchorfile>group__util.html</anchorfile>
       <anchor>ga5a86efbbd3e2eb391718d82a1d7ffcc</anchor>
@@ -6653,7 +6556,7 @@
       <arglist>(x)</arglist>
     </member>
     <member kind="typedef">
-      <type>stp_vars</type>
+      <type>struct stp_vars</type>
       <name>stp_vars_t</name>
       <anchorfile>group__vars.html</anchorfile>
       <anchor>g2d49c94847d18d8b62a214995b14680f</anchor>
@@ -6674,28 +6577,28 @@
       <arglist></arglist>
     </member>
     <member kind="typedef">
-      <type>void(*)</type>
+      <type>void(*</type>
       <name>stp_outfunc_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g6922054c644d73006bff95a8ad268a1a</anchor>
-      <arglist>(void *data, const char *buffer, size_t bytes)</arglist>
+      <anchor>g268c87919653380a22b1f69c78fe6555</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>g4541229554178e84408cccd89f532cb0</anchor>
-      <arglist>(void *)</arglist>
+      <anchor>g25e6aec21fd8f8a65c4c4086d0f3dec0</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>g7974f89cff4cbb5b225d0c4fbb92e9bb</anchor>
-      <arglist>(void *)</arglist>
+      <anchor>g1ac9aa4c059fbb52307d8522a5f1dc6d</anchor>
+      <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
-      <type>stp_compdata</type>
+      <type>struct stp_compdata</type>
       <name>compdata_t</name>
       <anchorfile>group__vars.html</anchorfile>
       <anchor>g4d45b95baae036143e14adfc0014f562</anchor>
@@ -7755,115 +7658,6 @@
     </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>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">
@@ -7896,27 +7690,27 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_color</name>
-    <filename>structstp__color.html</filename>
+    <name>stp_color_t</name>
+    <filename>structstp__color__t.html</filename>
     <member kind="variable">
       <type>const char *</type>
       <name>short_name</name>
-      <anchorfile>structstp__color.html</anchorfile>
-      <anchor>23ed4d11629625e2ad24b124c36c7fab</anchor>
+      <anchorfile>structstp__color__t.html</anchorfile>
+      <anchor>5a0f6f24bbb0048b8c4c0acec3f38500</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>long_name</name>
-      <anchorfile>structstp__color.html</anchorfile>
-      <anchor>b7c0a627b31ebfb97fd1db2677032479</anchor>
+      <anchorfile>structstp__color__t.html</anchorfile>
+      <anchor>9680717a1d04dbb522fd3eeb5b4f723b</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const stp_colorfuncs_t *</type>
       <name>colorfuncs</name>
-      <anchorfile>structstp__color.html</anchorfile>
-      <anchor>4442d36d0bcf746130f82ffe6f90147f</anchor>
+      <anchorfile>structstp__color__t.html</anchorfile>
+      <anchor>0ab4fc77eeb3eaedcea9c3a522fe5d57</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -7971,137 +7765,246 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_dither_matrix_generic</name>
-    <filename>structstp__dither__matrix__generic.html</filename>
+    <name>stp_dither_matrix_generic_t</name>
+    <filename>structstp__dither__matrix__generic__t.html</filename>
     <member kind="variable">
       <type>int</type>
       <name>x</name>
-      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>6b8bd1cc589c2195f055e5a57a05e03a</anchor>
+      <anchorfile>structstp__dither__matrix__generic__t.html</anchorfile>
+      <anchor>44cd10631c067bb550173f14368bee2b</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y</name>
-      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>aaddcac2ca33a3e822ded567bbbecfb9</anchor>
+      <anchorfile>structstp__dither__matrix__generic__t.html</anchorfile>
+      <anchor>2c8fdba16e3d594c2f929c521add0edb</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>bytes</name>
-      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>b963ddf7c0826bd3cc316c2375f1205b</anchor>
+      <anchorfile>structstp__dither__matrix__generic__t.html</anchorfile>
+      <anchor>ce2509068a38f137997f78ee5f86a3fd</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>prescaled</name>
-      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>478d54ddf9ba50e783ddec1532a0eff6</anchor>
+      <anchorfile>structstp__dither__matrix__generic__t.html</anchorfile>
+      <anchor>21d0ef7610c911ac9638abc9abac81ad</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const void *</type>
       <name>data</name>
-      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>52acbda296a57a6087852eab62bc62db</anchor>
+      <anchorfile>structstp__dither__matrix__generic__t.html</anchorfile>
+      <anchor>7a5ebd299bf32fb0711c4598610d05b2</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_dither_matrix_impl_t</name>
+    <filename>structstp__dither__matrix__impl__t.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>base</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>77db65014dea5548e6954ee4a76b7fd7</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>exp</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>dfe3c9f5a067437a69bdd83d43f3f804</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>x_size</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>7ce1ac8940686b11ce88494bcc166c5b</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>y_size</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>9cb8ed0493f8966e9929e1a966f0428c</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>total_size</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>094613ce00d0a095a9affae11be304f7</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>last_x</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>f0bb4535de37f2f78378fda1c7228886</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>last_x_mod</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>dd3deba1e7c232cb6d4890078dd14fe2</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>last_y</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>87a160f3b15be1e006f54dd840b31708</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>last_y_mod</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>b14d418c4cd370f340b0a30ef0804952</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>index</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>808aaba40f97218310e7fec5f8ad3da1</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>i_own</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>1dc9e02e9c08c84879a4432efcfdef40</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>x_offset</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>7a22d5818987bbcc0f77254c12519092</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>y_offset</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>e975508a01d5d57d589edf14cb3e0bb0</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned</type>
+      <name>fast_mask</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>524c9ed01e5f7f07d03e808afbeb9883</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned *</type>
+      <name>matrix</name>
+      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
+      <anchor>80a41648eea9699edd5c90759caef00c</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_dither_matrix_normal</name>
-    <filename>structstp__dither__matrix__normal.html</filename>
+    <name>stp_dither_matrix_normal_t</name>
+    <filename>structstp__dither__matrix__normal__t.html</filename>
     <member kind="variable">
       <type>int</type>
       <name>x</name>
-      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>b9564690be42859d88ea264a29321af3</anchor>
+      <anchorfile>structstp__dither__matrix__normal__t.html</anchorfile>
+      <anchor>be31b8f8dcc4c48be9c912ed720f63a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y</name>
-      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>410560f5186761cb7430f5b0a804b09c</anchor>
+      <anchorfile>structstp__dither__matrix__normal__t.html</anchorfile>
+      <anchor>2247e48b75c8f12fe091e1ce9d9bc14d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>bytes</name>
-      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>d72d088edfe3223c2df8fd4fb6178b98</anchor>
+      <anchorfile>structstp__dither__matrix__normal__t.html</anchorfile>
+      <anchor>4e85b66600eecdb606761d97e8263931</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>prescaled</name>
-      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>042561ad856d67506fe81b1bbbffd966</anchor>
+      <anchorfile>structstp__dither__matrix__normal__t.html</anchorfile>
+      <anchor>04fe7e891c1cb7b4e36b640d29d2616b</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned *</type>
       <name>data</name>
-      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>e67cb37136c5e9d9c4b1a44cd2dab87b</anchor>
+      <anchorfile>structstp__dither__matrix__normal__t.html</anchorfile>
+      <anchor>9c84f2864c2f2a07739e87030659b86d</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_dither_matrix_short</name>
-    <filename>structstp__dither__matrix__short.html</filename>
+    <name>stp_dither_matrix_short_t</name>
+    <filename>structstp__dither__matrix__short__t.html</filename>
     <member kind="variable">
       <type>int</type>
       <name>x</name>
-      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>81e0b20e763080b79faa837a00cac832</anchor>
+      <anchorfile>structstp__dither__matrix__short__t.html</anchorfile>
+      <anchor>f3e1cc731d40f28a67b7cba541f341f5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y</name>
-      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>2bbc6c72006541250ba23b48bcab60e8</anchor>
+      <anchorfile>structstp__dither__matrix__short__t.html</anchorfile>
+      <anchor>32c82f9dc3fd5fe381a0c5cd6abb073d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>bytes</name>
-      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>d4d85727401505eab74e3e667f4a38f4</anchor>
+      <anchorfile>structstp__dither__matrix__short__t.html</anchorfile>
+      <anchor>f16fe3d197917c57878a7eb47fb74f89</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>prescaled</name>
-      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>755361acae80fa4cba01a1cc71638274</anchor>
+      <anchorfile>structstp__dither__matrix__short__t.html</anchorfile>
+      <anchor>5cad2ace098daefb612a316c80013c19</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>
+      <anchorfile>structstp__dither__matrix__short__t.html</anchorfile>
+      <anchor>e809b6e6f3abfb477fc01c959050976b</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_dotsize</name>
-    <filename>structstp__dotsize.html</filename>
+    <name>stp_dotsize_t</name>
+    <filename>structstp__dotsize__t.html</filename>
     <member kind="variable">
       <type>unsigned</type>
       <name>bit_pattern</name>
-      <anchorfile>structstp__dotsize.html</anchorfile>
-      <anchor>8d5273395d0e27004f779de0ea81ff23</anchor>
+      <anchorfile>structstp__dotsize__t.html</anchorfile>
+      <anchor>1b77e2dff6771aeeb5ebccdc23a04314</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>double</type>
       <name>value</name>
-      <anchorfile>structstp__dotsize.html</anchorfile>
-      <anchor>d259e8d169a7d140e4964b80790c7ddd</anchor>
+      <anchorfile>structstp__dotsize__t.html</anchorfile>
+      <anchor>59531e49199b2adacf0944a7ac47359e</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -8124,80 +8027,80 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_family</name>
-    <filename>structstp__family.html</filename>
+    <name>stp_family_t</name>
+    <filename>structstp__family__t.html</filename>
     <member kind="variable">
       <type>const stp_printfuncs_t *</type>
       <name>printfuncs</name>
-      <anchorfile>structstp__family.html</anchorfile>
-      <anchor>d29f00ba3565e93c138b00e4a48cde77</anchor>
+      <anchorfile>structstp__family__t.html</anchorfile>
+      <anchor>393a6a8182a6ef2e56ef87ea620ef868</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_list_t *</type>
       <name>printer_list</name>
-      <anchorfile>structstp__family.html</anchorfile>
-      <anchor>6e4f0c216f5ced14a819fbacdb26547d</anchor>
+      <anchorfile>structstp__family__t.html</anchorfile>
+      <anchor>8b71d91daeb9b00d7b0ee3fe28509fe7</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_image</name>
-    <filename>structstp__image.html</filename>
+    <name>stp_image_t</name>
+    <filename>structstp__image__t.html</filename>
     <member kind="variable">
       <type>void(*</type>
       <name>init</name>
-      <anchorfile>structstp__image.html</anchorfile>
-      <anchor>ce69bf25344a814cabea38afa4527086</anchor>
+      <anchorfile>structstp__image__t.html</anchorfile>
+      <anchor>96e9c2c9f040fbc66abab45a4b2a79b0</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>
+      <anchorfile>structstp__image__t.html</anchorfile>
+      <anchor>ce331fd802c9c7c65a6538c03aecc0b3</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>
+      <anchorfile>structstp__image__t.html</anchorfile>
+      <anchor>e120f940a46eeb9d8f6a28b03cea88c0</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>
+      <anchorfile>structstp__image__t.html</anchorfile>
+      <anchor>687ae4bce9980985adfce7a15af38cde</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>
+      <anchorfile>structstp__image__t.html</anchorfile>
+      <anchor>d490679a2b158fcec555d54d7e9bc528</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>
+      <anchorfile>structstp__image__t.html</anchorfile>
+      <anchor>c8184c887110641206044785fae3f46d</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>
+      <anchorfile>structstp__image__t.html</anchorfile>
+      <anchor>75a8a76ab6d78ba767b21e5ed95827a7</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>
+      <anchorfile>structstp__image__t.html</anchorfile>
+      <anchor>e5ba3d09714043232aef970d245182ee</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -8317,98 +8220,123 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_module</name>
-    <filename>structstp__module.html</filename>
+    <name>stp_module_t</name>
+    <filename>structstp__module__t.html</filename>
     <member kind="variable">
       <type>const char *</type>
       <name>name</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>32e2db7046f281afd6748afe111aee76</anchor>
+      <anchorfile>structstp__module__t.html</anchorfile>
+      <anchor>87a2ab51de6f6860ac0803c0d8114bd7</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>version</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>e2038239913d3ddbece919082501c8d0</anchor>
+      <anchorfile>structstp__module__t.html</anchorfile>
+      <anchor>b5ec864c9d2932872dd2ba62c53ba813</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>comment</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>b60ac536d9ec7b3a306cddf4c06e18bb</anchor>
+      <anchorfile>structstp__module__t.html</anchorfile>
+      <anchor>66daab38c5658cdffd0ebd3c68e3b326</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_module_class_t</type>
       <name>class</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>4ebc727be1ec8edaaa1b25415a3932e3</anchor>
+      <anchorfile>structstp__module__t.html</anchorfile>
+      <anchor>1bd300254cbc047d2c00688cd7777aa3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void *</type>
       <name>handle</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>1a96aa2db220972e124717cc6dd03c8e</anchor>
+      <anchorfile>structstp__module__t.html</anchorfile>
+      <anchor>f1b13d76a5b44839e773b7ddaf7e73c5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>init</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>fa7d4259940b8d42a36f14108f504944</anchor>
+      <anchorfile>structstp__module__t.html</anchorfile>
+      <anchor>12d502ea2386865bc05fd659bebb974f</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>fini</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>e04ff0565f8ebd56b383917b602ffc4a</anchor>
+      <anchorfile>structstp__module__t.html</anchorfile>
+      <anchor>2b0e0c7ba523ac34f6a085a3eaaa33f4</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void *</type>
       <name>syms</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>0e7297a93920d8f6849718d0a32fa2ba</anchor>
+      <anchorfile>structstp__module__t.html</anchorfile>
+      <anchor>a9ecb04bec44f6348ccb9c86c1330405</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_module_version</name>
-    <filename>structstp__module__version.html</filename>
+    <name>stp_module_version_t</name>
+    <filename>structstp__module__version__t.html</filename>
     <member kind="variable">
       <type>int</type>
       <name>major</name>
-      <anchorfile>structstp__module__version.html</anchorfile>
-      <anchor>15add43e03d0e1624f40c083fa958692</anchor>
+      <anchorfile>structstp__module__version__t.html</anchorfile>
+      <anchor>3395d816d8cb9603ae00220ba74b0d94</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>minor</name>
-      <anchorfile>structstp__module__version.html</anchorfile>
-      <anchor>eced49a93c5e461fa95f809ad077fced</anchor>
+      <anchorfile>structstp__module__version__t.html</anchorfile>
+      <anchor>616356e2cc969782c10a138dfa06af42</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_mxml_attr_s</name>
-    <filename>structstp__mxml__attr__s.html</filename>
+    <name>stp_mxml_attr_t</name>
+    <filename>structstp__mxml__attr__t.html</filename>
     <member kind="variable">
       <type>char *</type>
       <name>name</name>
-      <anchorfile>structstp__mxml__attr__s.html</anchorfile>
-      <anchor>4ea32ac1f797cf7722bf3e8638b21dee</anchor>
+      <anchorfile>structstp__mxml__attr__t.html</anchorfile>
+      <anchor>37d8a0891b88e9bbc89f873dfb097682</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>value</name>
-      <anchorfile>structstp__mxml__attr__s.html</anchorfile>
-      <anchor>25554324bd8ccf8e9558e4705eda0daa</anchor>
+      <anchorfile>structstp__mxml__attr__t.html</anchorfile>
+      <anchor>9a5667da7d27fa347051fe5f80aeca0e</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_mxml_element_t</name>
+    <filename>structstp__mxml__element__t.html</filename>
+    <member kind="variable">
+      <type>char *</type>
+      <name>name</name>
+      <anchorfile>structstp__mxml__element__t.html</anchorfile>
+      <anchor>e678ef57706b8b2a5676612e4d5849c4</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>num_attrs</name>
+      <anchorfile>structstp__mxml__element__t.html</anchorfile>
+      <anchor>d016326e925b78b7c6b951f33500184a</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_mxml_attr_t *</type>
+      <name>attrs</name>
+      <anchorfile>structstp__mxml__element__t.html</anchorfile>
+      <anchor>347605ee2ec9846e6d9f56a1b80a5901</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -8466,84 +8394,59 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_mxml_text_s</name>
-    <filename>structstp__mxml__text__s.html</filename>
+    <name>stp_mxml_text_t</name>
+    <filename>structstp__mxml__text__t.html</filename>
     <member kind="variable">
       <type>int</type>
       <name>whitespace</name>
-      <anchorfile>structstp__mxml__text__s.html</anchorfile>
-      <anchor>76bcfbb8c3de4e1c597468d51ef47184</anchor>
+      <anchorfile>structstp__mxml__text__t.html</anchorfile>
+      <anchor>10493f8ced34febc9dafc554df0a9db8</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>
+      <anchorfile>structstp__mxml__text__t.html</anchorfile>
+      <anchor>82078f046e2331d07df9de1a6d526885</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="union">
-    <name>stp_mxml_value_u</name>
-    <filename>unionstp__mxml__value__u.html</filename>
+    <name>stp_mxml_value_t</name>
+    <filename>unionstp__mxml__value__t.html</filename>
     <member kind="variable">
       <type>stp_mxml_element_t</type>
       <name>element</name>
-      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>d4d8442bb433ac3da208e22ff0eaccf7</anchor>
+      <anchorfile>unionstp__mxml__value__t.html</anchorfile>
+      <anchor>96aab65fff9144bb7ac17e525769af31</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>integer</name>
-      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>9540870864c06f2bf901024b7cc9048d</anchor>
+      <anchorfile>unionstp__mxml__value__t.html</anchorfile>
+      <anchor>14551523faecca83828853601e399aee</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>opaque</name>
-      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>ca8f6bf03f29248dee0b8d364454d051</anchor>
+      <anchorfile>unionstp__mxml__value__t.html</anchorfile>
+      <anchor>50776acb8e84f99d12434b8db2d77b2e</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>double</type>
       <name>real</name>
-      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>3f253397958ad919a1fc97c42a58bc67</anchor>
+      <anchorfile>unionstp__mxml__value__t.html</anchorfile>
+      <anchor>0f60d52af338d4cbdd09b93879e89b1a</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>
+      <anchorfile>unionstp__mxml__value__t.html</anchorfile>
+      <anchor>3f462c7b6567252b1b2fe6eaf029e1cf</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -8727,7 +8630,7 @@
       <arglist></arglist>
     </member>
     <member kind="variable">
-      <type>stp_parameter_t::@0</type>
+      <type>union stp_parameter_t::@0</type>
       <name>bounds</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
       <anchor>bb297424036e868212f5086d5c5235fe</anchor>
@@ -8776,7 +8679,7 @@
       <arglist></arglist>
     </member>
     <member kind="variable">
-      <type>stp_parameter_t::@1</type>
+      <type>union stp_parameter_t::@1</type>
       <name>deflt</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
       <anchor>79042d88fa0ab284a8e3e4ad7b969f90</anchor>
@@ -8965,6 +8868,13 @@
       <anchor>81fa6b507a316a8d6d7404b29920936e</anchor>
       <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
+    <member kind="variable">
+      <type>stp_string_list_t *(*</type>
+      <name>get_external_options</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>1aee9299429a813e60c7c131ccf93c74</anchor>
+      <arglist>)(const stp_vars_t *v)</arglist>
+    </member>
   </compound>
   <compound kind="struct">
     <name>stp_raw_t</name>
@@ -8985,27 +8895,27 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_shade</name>
-    <filename>structstp__shade.html</filename>
+    <name>stp_shade_t</name>
+    <filename>structstp__shade__t.html</filename>
     <member kind="variable">
       <type>double</type>
       <name>value</name>
-      <anchorfile>structstp__shade.html</anchorfile>
-      <anchor>07a72426c7bcbf22f1cc253a97a453d4</anchor>
+      <anchorfile>structstp__shade__t.html</anchorfile>
+      <anchor>d43f8713d01af090ecb910a8b5538125</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>numsizes</name>
-      <anchorfile>structstp__shade.html</anchorfile>
-      <anchor>8e68774d99e3eecb76f06f7704f1eb90</anchor>
+      <anchorfile>structstp__shade__t.html</anchorfile>
+      <anchor>06cdc2392609bb5e0fd731b02ad7dc1b</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>
+      <anchorfile>structstp__shade__t.html</anchorfile>
+      <anchor>7ab08079ac4667939bfebfc1454101e8</anchor>
       <arglist></arglist>
     </member>
   </compound>
diff --git a/doc/gutenprint/html/annotated.html b/doc/gutenprint/html/annotated.html
index 33c149c..4170ab4 100644
--- a/doc/gutenprint/html/annotated.html
+++ b/doc/gutenprint/html/annotated.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -22,42 +22,42 @@
   </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>
-  <tr><td class="indexkey"><a class="el" href="structstp__color.html">stp_color</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__color__t.html">stp_color_t</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a></td><td class="indexvalue">Point (x,y) for piecewise curve </td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__dotsize.html">stp_dotsize</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__generic__t.html">stp_dither_matrix_generic_t</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__normal__t.html">stp_dither_matrix_normal_t</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__short__t.html">stp_dither_matrix_short_t</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__dotsize__t.html">stp_dotsize_t</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a></td><td class="indexvalue">Double_bound (range) parameter </td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__family.html">stp_family</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__image.html">stp_image</a></td><td class="indexvalue">The image type is an abstract data type for interfacing with the image creation program </td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__family__t.html">stp_family_t</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__image__t.html">stp_image_t</a></td><td class="indexvalue">The image type is an abstract data type for interfacing with the image creation program </td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a></td><td class="indexvalue">Int_bound (range) parameter </td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__module.html">stp_module</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__module__version.html">stp_module_version</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__module__t.html">stp_module_t</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__module__version__t.html">stp_module_version_t</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__mxml__attr__t.html">stp_mxml_attr_t</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__mxml__element__t.html">stp_mxml_element_t</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__mxml__text__t.html">stp_mxml_text_t</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="unionstp__mxml__value__t.html">stp_mxml_value_t</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a></td><td class="indexvalue">The papersize data type </td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a></td><td class="indexvalue">String parameter </td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a></td><td class="indexvalue">Parameter description </td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__pass__t.html">stp_pass_t</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__raw__t.html">stp_raw_t</a></td><td class="indexvalue">Raw parameter </td></tr>
-  <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__shade__t.html">stp_shade_t</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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/array_8h.html b/doc/gutenprint/html/array_8h.html
index 86f322d..c74e5b0 100644
--- a/doc/gutenprint/html/array_8h.html
+++ b/doc/gutenprint/html/array_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,19 +14,11 @@
     <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>
+<h1>include/gutenprint/array.h File Reference</h1><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#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct 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#g26a474575a39c1c36ad520b95aa813b0"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -65,10 +57,8 @@
 <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="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
+Array functions. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/bit-ops_8h.html b/doc/gutenprint/html/bit-ops_8h.html
index c6a727b..916eca1 100644
--- a/doc/gutenprint/html/bit-ops_8h.html
+++ b/doc/gutenprint/html/bit-ops_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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">
+<h1>include/gutenprint/bit-ops.h File Reference</h1><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#1a36a9f23f967528df8fffbd71b5e96c">stp_fold</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
@@ -47,9 +39,7 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Bit operations. 
-<p>
-<hr><h2>Function Documentation</h2>
+Bit operations. <hr><h2>Function Documentation</h2>
 <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">
@@ -616,8 +606,8 @@ Bit operations.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/channel_8h.html b/doc/gutenprint/html/channel_8h.html
index bfc264f..9b2c5d7 100644
--- a/doc/gutenprint/html/channel_8h.html
+++ b/doc/gutenprint/html/channel_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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">
+<h1>include/gutenprint/channel.h File Reference</h1><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#90026b1db4586b08df148db41a676b50">stp_channel_reset</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
@@ -65,7 +57,7 @@
 
 <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#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#35b64c052b8dcfd4f1576b10d999e022">stp_channel_initialize</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.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#4559ad54f7de2403438baab1c97789f7">stp_channel_convert</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned *zero_mask)</td></tr>
 
@@ -75,9 +67,7 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Channel functions. 
-<p>
-<hr><h2>Function Documentation</h2>
+Channel functions. <hr><h2>Function Documentation</h2>
 <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">
@@ -435,7 +425,7 @@ Channel functions.
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
@@ -768,8 +758,8 @@ Channel functions.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/classes.html b/doc/gutenprint/html/classes.html
index 44d9f76..7b233cc 100644
--- a/doc/gutenprint/html/classes.html
+++ b/doc/gutenprint/html/classes.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,13 +21,12 @@
     <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>
+<h1>libgutenprint API Reference Data Structure Index</h1><p><div class="qindex"><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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint 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="structstp__dither__matrix__normal__t.html">stp_dither_matrix_normal_t</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__t.html">stp_mxml_attr_t</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 class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dither__matrix__short__t.html">stp_dither_matrix_short_t</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__element__t.html">stp_mxml_element_t</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__color__t.html">stp_color_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dotsize__t.html">stp_dotsize_t</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__node__s.html">stp_mxml_node_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__colorfuncs__t.html">stp_colorfuncs_t</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__text__t.html">stp_mxml_text_t</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__curve__point__t.html">stp_curve_point_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__family__t.html">stp_family_t</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__t.html">stp_mxml_value_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__shade__t.html">stp_shade_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__dither__matrix__generic__t.html">stp_dither_matrix_generic_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__image__t.html">stp_image_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module__t.html">stp_module_t</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><tr><td><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</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__t.html">stp_module_version_t</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></table><p><div class="qindex"><a class="qindex" href="#letter_S">S</a></div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/color_8h.html b/doc/gutenprint/html/color_8h.html
index 28544d0..3a78ea5 100644
--- a/doc/gutenprint/html/color_8h.html
+++ b/doc/gutenprint/html/color_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,60 +14,47 @@
     <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">
+<h1>include/gutenprint/color.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a></td></tr>
 
-<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#gd1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color__t.html">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#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#g23392fc53078d51fcd14d6d565d56423">stp_color_init</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.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#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">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__t.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#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#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#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#g47d6a8163ef21a6e700b1371228b851d">stp_color_register</a> (const <a class="el" href="structstp__color__t.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#g2b62ec8e0afe1b6297bc71466f8a334c">stp_color_unregister</a> (const <a class="el" href="structstp__color__t.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#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#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="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color__t.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#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="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color__t.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#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 <a class="el" href="structstp__color__t.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#g5a4a4da67cb5c3f1c0a2a9618e46ed50">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__t.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="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__t.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#g612389b45f09358f6bad0e376c91b057"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Color functions. 
-<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;
+Color functions. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve-cache_8h.html b/doc/gutenprint/html/curve-cache_8h.html
index 30dd680..3797fb4 100644
--- a/doc/gutenprint/html/curve-cache_8h.html
+++ b/doc/gutenprint/html/curve-cache_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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>
+<h1>include/gutenprint/curve-cache.h File Reference</h1><code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
@@ -58,9 +50,7 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Curve caching functions. 
-<p>
-<hr><h2>Define Documentation</h2>
+Curve caching functions. <hr><h2>Define Documentation</h2>
 <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">
@@ -349,8 +339,8 @@ Curve caching functions.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve_8h.html b/doc/gutenprint/html/curve_8h.html
index 5d071bc..50ec8b6 100644
--- a/doc/gutenprint/html/curve_8h.html
+++ b/doc/gutenprint/html/curve_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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>
+<h1>include/gutenprint/curve.h File Reference</h1><code>#include &lt;stdio.h&gt;</code><br>
 <code>#include &lt;stdlib.h&gt;</code><br>
 <code>#include &lt;<a class="el" href="sequence_8h.html">gutenprint/sequence.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -32,7 +24,7 @@
 
 <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#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct 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#g375a2b23705fb0698ae1d823243c8524"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
@@ -197,10 +189,8 @@
 <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="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
+Curve functions. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/deprecated.html b/doc/gutenprint/html/deprecated.html
index f908fd2..9d7e2fc 100644
--- a/doc/gutenprint/html/deprecated.html
+++ b/doc/gutenprint/html/deprecated.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -23,8 +23,8 @@
 <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="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/dither_8h.html b/doc/gutenprint/html/dither_8h.html
index dc764ea..95f2d99 100644
--- a/doc/gutenprint/html/dither_8h.html
+++ b/doc/gutenprint/html/dither_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,28 +14,20 @@
     <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">
+<h1>include/gutenprint/dither.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short__t.html">stp_dither_matrix_short_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal__t.html">stp_dither_matrix_normal_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic__t.html">stp_dither_matrix_generic_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html">stp_dotsize</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize__t.html">stp_dotsize_t</a></td></tr>
 
-<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 class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade__t.html">stp_shade_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="dither_8h.html#9da4fbd724d498250c7129ccbb88c9a3">STP_ECOLOR_K</a>&nbsp;&nbsp;&nbsp;0</td></tr>
@@ -48,41 +40,28 @@
 
 <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#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#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#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#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#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#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#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#36691189c1f859d82675f32f5046e674">stp_dither_matrix_iterated_init</a> (<a class="el" href="structstp__dither__matrix__impl__t.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#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#df8bb5a54d552846dcf4d1534d612b65">stp_dither_matrix_shear</a> (<a class="el" href="structstp__dither__matrix__impl__t.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#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#2c42ec7156263c024ea6f51ab3b17530">stp_dither_matrix_init</a> (<a class="el" href="structstp__dither__matrix__impl__t.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#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">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="structstp__dither__matrix__impl__t.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#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#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#53b7ba7fd141db6ef43c68a6f500bda2">stp_dither_matrix_init_from_dither_array</a> (<a class="el" href="structstp__dither__matrix__impl__t.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#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#49ff7bd6b10cd34f9164b4414adbb87c">stp_dither_matrix_destroy</a> (<a class="el" href="structstp__dither__matrix__impl__t.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#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#d0dfe2800ed318431a0a54c1ed7d383b">stp_dither_matrix_clone</a> (const <a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structstp__dither__matrix__impl__t.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#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#3ea3c72ff26afef246873edc0bc542d3">stp_dither_matrix_copy</a> (const <a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structstp__dither__matrix__impl__t.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#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#a62e8e672a125150074ea9bddb474423">stp_dither_matrix_scale_exponentially</a> (<a class="el" href="structstp__dither__matrix__impl__t.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#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">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="structstp__dither__matrix__impl__t.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#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>
 
@@ -90,11 +69,11 @@
 
 <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#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#9835738585d6a9053eaeacdca25d0fe6">stp_dither_init</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.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#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#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#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__t.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#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>
 
@@ -112,7 +91,7 @@
 
 <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#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#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__t.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#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>
 
@@ -126,9 +105,7 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Dither functions. 
-<p>
-<hr><h2>Define Documentation</h2>
+Dither functions. <hr><h2>Define Documentation</h2>
 <a class="anchor" name="fb855574a9dd1ce3c0ac8e353917cf40"></a><!-- doxytag: member="dither.h::STP_ECOLOR_C" ref="fb855574a9dd1ce3c0ac8e353917cf40" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -204,97 +181,6 @@ Dither functions.
 
 </div>
 </div><p>
-<hr><h2>Typedef Documentation</h2>
-<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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
 <hr><h2>Function Documentation</h2>
 <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">
@@ -537,7 +423,7 @@ Dither functions.
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
@@ -651,13 +537,13 @@ Dither functions.
         <tr>
           <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="paramtype">const <a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>src</em>, </td>
         </tr>
         <tr>
           <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="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>dest</em>, </td>
         </tr>
         <tr>
@@ -692,13 +578,13 @@ Dither functions.
         <tr>
           <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="paramtype">const <a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>src</em>, </td>
         </tr>
         <tr>
           <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="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>dest</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -721,7 +607,7 @@ Dither functions.
         <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="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -741,7 +627,7 @@ Dither functions.
         <tr>
           <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="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -794,7 +680,7 @@ Dither functions.
         <tr>
           <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="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -829,7 +715,7 @@ Dither functions.
         <tr>
           <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="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -882,7 +768,7 @@ Dither functions.
         <tr>
           <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="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -923,7 +809,7 @@ Dither functions.
         <tr>
           <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="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -952,7 +838,7 @@ Dither functions.
         <tr>
           <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="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -981,7 +867,7 @@ Dither functions.
         <tr>
           <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="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -1177,7 +1063,7 @@ Dither functions.
         <tr>
           <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="paramtype">const <a class="el" href="structstp__shade__t.html">stp_shade_t</a> *&nbsp;</td>
           <td class="paramname"> <em>shades</em>, </td>
         </tr>
         <tr>
@@ -1330,7 +1216,7 @@ Dither functions.
         <tr>
           <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="paramtype">const <a class="el" href="structstp__dither__matrix__generic__t.html">stp_dither_matrix_generic_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -1492,8 +1378,8 @@ Dither functions.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/files.html b/doc/gutenprint/html/files.html
index 614f956..708a0bc 100644
--- a/doc/gutenprint/html/files.html
+++ b/doc/gutenprint/html/files.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,34 +21,34 @@
   </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>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="channel_8h.html">channel.h</a></td><td class="indexvalue">Channel functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="color_8h.html">color.h</a></td><td class="indexvalue">Color functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="curve-cache_8h.html">curve-cache.h</a></td><td class="indexvalue">Curve caching functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="curve_8h.html">curve.h</a></td><td class="indexvalue">Curve functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></td><td class="indexvalue">Dither functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-intl-internal_8h.html">gutenprint-intl-internal.h</a></td><td class="indexvalue">Internationalisation functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-intl_8h.html">gutenprint-intl.h</a></td><td class="indexvalue">Internationalisation functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-module_8h.html">gutenprint-module.h</a></td><td class="indexvalue">Gutenprint module header </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-version_8h.html">gutenprint-version.h</a></td><td class="indexvalue">Version functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint_8h.html">gutenprint.h</a></td><td class="indexvalue">Gutenprint master header </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="image_8h.html">image.h</a></td><td class="indexvalue">Image functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="list_8h.html">list.h</a></td><td class="indexvalue">Generic list functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="module_8h.html">module.h</a></td><td class="indexvalue">Module functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></td><td class="indexvalue">Mini-XML XML parsing functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="paper_8h.html">paper.h</a></td><td class="indexvalue">Paper size functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="path_8h.html">path.h</a></td><td class="indexvalue">Simple directory path functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></td><td class="indexvalue">Printer functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="sequence_8h.html">sequence.h</a></td><td class="indexvalue">Sequence functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="string-list_8h.html">string-list.h</a></td><td class="indexvalue">String list functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="util_8h.html">util.h</a></td><td class="indexvalue">Utility functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></td><td class="indexvalue">Print job functions </td></tr>
-  <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>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="array_8h.html">array.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="bit-ops_8h.html">bit-ops.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="channel_8h.html">channel.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="color_8h.html">color.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="curve-cache_8h.html">curve-cache.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="curve_8h.html">curve.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-intl-internal_8h.html">gutenprint-intl-internal.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-intl_8h.html">gutenprint-intl.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-module_8h.html">gutenprint-module.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-version_8h.html">gutenprint-version.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint_8h.html">gutenprint.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="image_8h.html">image.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="list_8h.html">list.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="module_8h.html">module.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="paper_8h.html">paper.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="path_8h.html">path.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="sequence_8h.html">sequence.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="string-list_8h.html">string-list.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="util_8h.html">util.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="xml_8h.html">xml.h</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions.html b/doc/gutenprint/html/functions.html
index ba17dca..aa798e3 100644
--- a/doc/gutenprint/html/functions.html
+++ b/doc/gutenprint/html/functions.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -62,13 +62,13 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>array
 : <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>
+: <a class="el" href="structstp__mxml__element__t.html#347605ee2ec9846e6d9f56a1b80a5901">stp_mxml_element_t</a>
 </ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>base
-: <a class="el" href="structdither__matrix__impl.html#331debb887e076f8b52952ba6cc2b50b">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#77db65014dea5548e6954ee4a76b7fd7">stp_dither_matrix_impl_t</a>
 <li>bit_pattern
-: <a class="el" href="structstp__dotsize.html#8d5273395d0e27004f779de0ea81ff23">stp_dotsize</a>
+: <a class="el" href="structstp__dotsize__t.html#1b77e2dff6771aeeb5ebccdc23a04314">stp_dotsize_t</a>
 <li>boolean
 : <a class="el" href="structstp__parameter__t.html#74aaa2515728660657133ca3191e422c">stp_parameter_t</a>
 <li>bottom
@@ -76,10 +76,10 @@ Here is a list of all struct and union fields with links to the structures/union
 <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__dither__matrix__normal__t.html#4e85b66600eecdb606761d97e8263931">stp_dither_matrix_normal_t</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>
+, <a class="el" href="structstp__dither__matrix__generic__t.html#ce2509068a38f137997f78ee5f86a3fd">stp_dither_matrix_generic_t</a>
+, <a class="el" href="structstp__dither__matrix__short__t.html#f16fe3d197917c57878a7eb47fb74f89">stp_dither_matrix_short_t</a>
 </ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>category
@@ -89,28 +89,28 @@ Here is a list of all struct and union fields with links to the structures/union
 <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>
+: <a class="el" href="structstp__module__t.html#1bd300254cbc047d2c00688cd7777aa3">stp_module_t</a>
 <li>colorfuncs
-: <a class="el" href="structstp__color.html#4442d36d0bcf746130f82ffe6f90147f">stp_color</a>
+: <a class="el" href="structstp__color__t.html#0ab4fc77eeb3eaedcea9c3a522fe5d57">stp_color_t</a>
 <li>comment
-: <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module</a>
+: <a class="el" href="structstp__module__t.html#66daab38c5658cdffd0ebd3c68e3b326">stp_module_t</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>
+: <a class="el" href="structstp__image__t.html#75a8a76ab6d78ba767b21e5ed95827a7">stp_image_t</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>
+: <a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">stp_parameter_t</a>
+, <a class="el" href="structstp__cached__curve__t.html#e9b4170bfafe7d85b36689cbd8eea41e">stp_cached_curve_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#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__dither__matrix__short__t.html#e809b6e6f3abfb477fc01c959050976b">stp_dither_matrix_short_t</a>
+, <a class="el" href="structstp__dither__matrix__generic__t.html#7a5ebd299bf32fb0711c4598610d05b2">stp_dither_matrix_generic_t</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>
+, <a class="el" href="structstp__dither__matrix__normal__t.html#9c84f2864c2f2a07739e87030659b86d">stp_dither_matrix_normal_t</a>
 <li>dbl
 : <a class="el" href="structstp__parameter__t.html#12fc8869d3056687e576af63c6fbd675">stp_parameter_t</a>
 <li>deflt
@@ -124,54 +124,56 @@ Here is a list of all struct and union fields with links to the structures/union
 <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>
+: <a class="el" href="structstp__shade__t.html#7ab08079ac4667939bfebfc1454101e8">stp_shade_t</a>
 </ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>element
-: <a class="el" href="unionstp__mxml__value__u.html#d4d8442bb433ac3da208e22ff0eaccf7">stp_mxml_value_u</a>
+: <a class="el" href="unionstp__mxml__value__t.html#96aab65fff9144bb7ac17e525769af31">stp_mxml_value_t</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>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#dfe3c9f5a067437a69bdd83d43f3f804">stp_dither_matrix_impl_t</a>
 </ul>
 <h3><a class="anchor" name="index_f">- f -</a></h3><ul>
 <li>fast_mask
-: <a class="el" href="structdither__matrix__impl.html#8c7141e2e35f6cc14896d23d15a81914">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#524c9ed01e5f7f07d03e808afbeb9883">stp_dither_matrix_impl_t</a>
 <li>fini
-: <a class="el" href="structstp__module.html#e04ff0565f8ebd56b383917b602ffc4a">stp_module</a>
+: <a class="el" href="structstp__module__t.html#2b0e0c7ba523ac34f6a085a3eaaa33f4">stp_module_t</a>
 </ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_appname
-: <a class="el" href="structstp__image.html#56636ad7c0dbf0a82284241f796d95cd">stp_image</a>
+: <a class="el" href="structstp__image__t.html#c8184c887110641206044785fae3f46d">stp_image_t</a>
+<li>get_external_options
+: <a class="el" href="structstp__printfuncs__t.html#1aee9299429a813e60c7c131ccf93c74">stp_printfuncs_t</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>
+, <a class="el" href="structstp__image__t.html#d490679a2b158fcec555d54d7e9bc528">stp_image_t</a>
 </ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>handle
-: <a class="el" href="structstp__module.html#1a96aa2db220972e124717cc6dd03c8e">stp_module</a>
+: <a class="el" href="structstp__module__t.html#f1b13d76a5b44839e773b7ddaf7e73c5">stp_module_t</a>
 <li>height
-: <a class="el" href="structstp__image.html#4977ad211581999a3f3290983929cce9">stp_image</a>
+: <a class="el" href="structstp__image__t.html#687ae4bce9980985adfce7a15af38cde">stp_image_t</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#78152fe120c430f6400b731e5c722bd3">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#1dc9e02e9c08c84879a4432efcfdef40">stp_dither_matrix_impl_t</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>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#808aaba40f97218310e7fec5f8ad3da1">stp_dither_matrix_impl_t</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>
+, <a class="el" href="structstp__image__t.html#96e9c2c9f040fbc66abab45a4b2a79b0">stp_image_t</a>
+, <a class="el" href="structstp__module__t.html#12d502ea2386865bc05fd659bebb974f">stp_module_t</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>
+: <a class="el" href="structstp__parameter__t.html#32ee2ba322a0b7d16520f52ded591cc5">stp_parameter_t</a>
+, <a class="el" href="unionstp__mxml__value__t.html#14551523faecca83828853601e399aee">stp_mxml_value_t</a>
 <li>is_active
 : <a class="el" href="structstp__parameter__t.html#8b1af01f0874c79b6dbc4d0eca432952">stp_parameter_t</a>
 <li>is_mandatory
@@ -185,68 +187,68 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>last_child
 : <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>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#f0bb4535de37f2f78378fda1c7228886">stp_dither_matrix_impl_t</a>
 <li>last_x_mod
-: <a class="el" href="structdither__matrix__impl.html#16f516218f0c5a31a1eac49e5c57add5">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#dd3deba1e7c232cb6d4890078dd14fe2">stp_dither_matrix_impl_t</a>
 <li>last_y
-: <a class="el" href="structdither__matrix__impl.html#c1a83c82c364098dce631ec7174574be">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#87a160f3b15be1e006f54dd840b31708">stp_dither_matrix_impl_t</a>
 <li>last_y_mod
-: <a class="el" href="structdither__matrix__impl.html#d03881dd78211b5bcb1a62453c060d2e">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#b14d418c4cd370f340b0a30ef0804952">stp_dither_matrix_impl_t</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>
+: <a class="el" href="structstp__colorfuncs__t.html#14c6ae1a87ba1ba33f88fa71038f9ec9">stp_colorfuncs_t</a>
+, <a class="el" href="structstp__printfuncs__t.html#19dc0ba4351a154cf9450ac4fce1ca1a">stp_printfuncs_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>
+: <a class="el" href="structstp__color__t.html#9680717a1d04dbb522fd3eeb5b4f723b">stp_color_t</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>
+: <a class="el" href="structstp__double__bound__t.html#a00903ee6e04e01b6b2bb7033e3c76ce">stp_double_bound_t</a>
+, <a class="el" href="structstp__int__bound__t.html#c5ae98fad865ad6d4816016e233f5a53">stp_int_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#15add43e03d0e1624f40c083fa958692">stp_module_version</a>
+: <a class="el" href="structstp__module__version__t.html#3395d816d8cb9603ae00220ba74b0d94">stp_module_version_t</a>
 <li>matrix
-: <a class="el" href="structdither__matrix__impl.html#e28102f9e3d3cfb8eb48d9e69e807f96">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#80a41648eea9699edd5c90759caef00c">stp_dither_matrix_impl_t</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>
+: <a class="el" href="structstp__module__version__t.html#616356e2cc969782c10a138dfa06af42">stp_module_version_t</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__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__module__t.html#87a2ab51de6f6860ac0803c0d8114bd7">stp_module_t</a>
+, <a class="el" href="structstp__mxml__attr__t.html#37d8a0891b88e9bbc89f873dfb097682">stp_mxml_attr_t</a>
+, <a class="el" href="structstp__papersize__t.html#660431e579bf100782f7164b45597982">stp_papersize_t</a>
 , <a class="el" href="structstp__param__string__t.html#c4ccea0dded827b9acdb2d22aa25857b">stp_param_string_t</a>
+, <a class="el" href="structstp__mxml__element__t.html#e678ef57706b8b2a5676612e4d5849c4">stp_mxml_element_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__lineactive__t.html#266bdeb14e62fb5b17a31746ad511761">stp_lineactive_t</a>
 , <a class="el" href="structstp__linecount__t.html#69275ad8687438976d07950fa65a1728">stp_linecount_t</a>
+, <a class="el" href="structstp__lineoff__t.html#97c5a2281b3cddb9c546e8299ea4e2b0">stp_lineoff_t</a>
+, <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>
 <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>
+: <a class="el" href="structstp__mxml__element__t.html#d016326e925b78b7c6b951f33500184a">stp_mxml_element_t</a>
 <li>numsizes
-: <a class="el" href="structstp__shade.html#8e68774d99e3eecb76f06f7704f1eb90">stp_shade</a>
+: <a class="el" href="structstp__shade__t.html#06cdc2392609bb5e0fd731b02ad7dc1b">stp_shade_t</a>
 </ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>opaque
-: <a class="el" href="unionstp__mxml__value__u.html#ca8f6bf03f29248dee0b8d364454d051">stp_mxml_value_u</a>
+: <a class="el" href="unionstp__mxml__value__t.html#50776acb8e84f99d12434b8db2d77b2e">stp_mxml_value_t</a>
 </ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>p_class
@@ -268,30 +270,30 @@ Here is a list of all struct and union fields with links to the structures/union
 : <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>
+: <a class="el" href="structstp__weave__t.html#aec693e98c7587da452ac604b675be3c">stp_weave_t</a>
+, <a class="el" href="structstp__pass__t.html#0da3d73932d6c07aceaf4bce93cf6163">stp_pass_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>
+: <a class="el" href="structstp__dither__matrix__normal__t.html#04fe7e891c1cb7b4e36b640d29d2616b">stp_dither_matrix_normal_t</a>
+, <a class="el" href="structstp__dither__matrix__generic__t.html#21d0ef7610c911ac9638abc9abac81ad">stp_dither_matrix_generic_t</a>
+, <a class="el" href="structstp__dither__matrix__short__t.html#5cad2ace098daefb612a316c80013c19">stp_dither_matrix_short_t</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>
+: <a class="el" href="structstp__family__t.html#8b71d91daeb9b00d7b0ee3fe28509fe7">stp_family_t</a>
 <li>printfuncs
-: <a class="el" href="structstp__family.html#d29f00ba3565e93c138b00e4a48cde77">stp_family</a>
+: <a class="el" href="structstp__family__t.html#393a6a8182a6ef2e56ef87ea620ef868">stp_family_t</a>
 </ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>read_only
 : <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>
+: <a class="el" href="unionstp__mxml__value__t.html#0f60d52af338d4cbdd09b93879e89b1a">stp_mxml_value_t</a>
 <li>rep
-: <a class="el" href="structstp__image.html#b18e6ee35037589bf485213022e2d871">stp_image</a>
+: <a class="el" href="structstp__image__t.html#e5ba3d09714043232aef970d245182ee">stp_image_t</a>
 <li>reset
-: <a class="el" href="structstp__image.html#7bb2244368c6b1e07d27afb3dd249ffd">stp_image</a>
+: <a class="el" href="structstp__image__t.html#ce331fd802c9c7c65a6538c03aecc0b3">stp_image_t</a>
 <li>right
 : <a class="el" href="structstp__papersize__t.html#6899599f2f940e95e03545ff71e2b4c5">stp_papersize_t</a>
 <li>row
@@ -301,30 +303,30 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>s_cache
 : <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>
+: <a class="el" href="structstp__color__t.html#5a0f6f24bbb0048b8c4c0acec3f38500">stp_color_t</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>
+: <a class="el" href="structstp__parameter__t.html#bfe1adab94129fefdafe9e64be135fb6">stp_parameter_t</a>
 <li>string
-: <a class="el" href="structstp__mxml__text__s.html#ef1865e8cab7d5ab175c6e67f122be15">stp_mxml_text_s</a>
+: <a class="el" href="structstp__mxml__text__t.html#82078f046e2331d07df9de1a6d526885">stp_mxml_text_t</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>
+: <a class="el" href="structstp__module__t.html#a9ecb04bec44f6348ccb9c86c1330405">stp_module_t</a>
 </ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>text
-: <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="unionstp__mxml__value__t.html#3f462c7b6567252b1b2fe6eaf029e1cf">stp_mxml_value_t</a>
 , <a class="el" href="structstp__papersize__t.html#26e8b5d0ce282614f128dd9d4aeaf9f6">stp_papersize_t</a>
+, <a class="el" href="structstp__parameter__t.html#396e4980926c200e9ce4454f19e7311a">stp_parameter_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>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#094613ce00d0a095a9affae11be304f7">stp_dither_matrix_impl_t</a>
 <li>type
 : <a class="el" href="structstp__mxml__node__s.html#e1bff9adee67699067516eee014a7510">stp_mxml_node_s</a>
 </ul>
@@ -336,52 +338,52 @@ Here is a list of all struct and union fields with links to the structures/union
 <h3><a class="anchor" name="index_v">- v -</a></h3><ul>
 <li>v
 : <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__linebufs__t.html#485ecae7a892476331d31079d33b9891">stp_linebufs_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>
+: <a class="el" href="structstp__mxml__node__s.html#ad44d6b2fe0842de0bbf1312035372cd">stp_mxml_node_s</a>
+, <a class="el" href="structstp__mxml__attr__t.html#9a5667da7d27fa347051fe5f80aeca0e">stp_mxml_attr_t</a>
+, <a class="el" href="structstp__dotsize__t.html#59531e49199b2adacf0944a7ac47359e">stp_dotsize_t</a>
+, <a class="el" href="structstp__shade__t.html#d43f8713d01af090ecb910a8b5538125">stp_shade_t</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>
+: <a class="el" href="structstp__module__t.html#b5ec864c9d2932872dd2ba62c53ba813">stp_module_t</a>
 </ul>
 <h3><a class="anchor" name="index_w">- w -</a></h3><ul>
 <li>whitespace
-: <a class="el" href="structstp__mxml__text__s.html#76bcfbb8c3de4e1c597468d51ef47184">stp_mxml_text_s</a>
+: <a class="el" href="structstp__mxml__text__t.html#10493f8ced34febc9dafc554df0a9db8">stp_mxml_text_t</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>
+, <a class="el" href="structstp__image__t.html#e120f940a46eeb9d8f6a28b03cea88c0">stp_image_t</a>
 </ul>
 <h3><a class="anchor" name="index_x">- x -</a></h3><ul>
 <li>x
 : <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>
+, <a class="el" href="structstp__dither__matrix__short__t.html#f3e1cc731d40f28a67b7cba541f341f5">stp_dither_matrix_short_t</a>
+, <a class="el" href="structstp__dither__matrix__generic__t.html#44cd10631c067bb550173f14368bee2b">stp_dither_matrix_generic_t</a>
+, <a class="el" href="structstp__dither__matrix__normal__t.html#be31b8f8dcc4c48be9c912ed720f63a6">stp_dither_matrix_normal_t</a>
 <li>x_offset
-: <a class="el" href="structdither__matrix__impl.html#665c02056a2d046a15aab462492d9dbc">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#7a22d5818987bbcc0f77254c12519092">stp_dither_matrix_impl_t</a>
 <li>x_size
-: <a class="el" href="structdither__matrix__impl.html#063e3b3617c3a9b4883f3b01cd7dfb48">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#7ce1ac8940686b11ce88494bcc166c5b">stp_dither_matrix_impl_t</a>
 </ul>
 <h3><a class="anchor" name="index_y">- y -</a></h3><ul>
 <li>y
 : <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>
+, <a class="el" href="structstp__dither__matrix__short__t.html#32c82f9dc3fd5fe381a0c5cd6abb073d">stp_dither_matrix_short_t</a>
+, <a class="el" href="structstp__dither__matrix__generic__t.html#2c8fdba16e3d594c2f929c521add0edb">stp_dither_matrix_generic_t</a>
+, <a class="el" href="structstp__dither__matrix__normal__t.html#2247e48b75c8f12fe091e1ce9d9bc14d">stp_dither_matrix_normal_t</a>
 <li>y_offset
-: <a class="el" href="structdither__matrix__impl.html#844cb19ea61f035bc2a21536f6f392c4">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#e975508a01d5d57d589edf14cb3e0bb0">stp_dither_matrix_impl_t</a>
 <li>y_size
-: <a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#9cb8ed0493f8966e9929e1a966f0428c">stp_dither_matrix_impl_t</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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions_vars.html b/doc/gutenprint/html/functions_vars.html
index fa8cb5f..31dd8b7 100644
--- a/doc/gutenprint/html/functions_vars.html
+++ b/doc/gutenprint/html/functions_vars.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -62,13 +62,13 @@
 <li>array
 : <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>
+: <a class="el" href="structstp__mxml__element__t.html#347605ee2ec9846e6d9f56a1b80a5901">stp_mxml_element_t</a>
 </ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>base
-: <a class="el" href="structdither__matrix__impl.html#331debb887e076f8b52952ba6cc2b50b">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#77db65014dea5548e6954ee4a76b7fd7">stp_dither_matrix_impl_t</a>
 <li>bit_pattern
-: <a class="el" href="structstp__dotsize.html#8d5273395d0e27004f779de0ea81ff23">stp_dotsize</a>
+: <a class="el" href="structstp__dotsize__t.html#1b77e2dff6771aeeb5ebccdc23a04314">stp_dotsize_t</a>
 <li>boolean
 : <a class="el" href="structstp__parameter__t.html#74aaa2515728660657133ca3191e422c">stp_parameter_t</a>
 <li>bottom
@@ -76,10 +76,10 @@
 <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__dither__matrix__normal__t.html#4e85b66600eecdb606761d97e8263931">stp_dither_matrix_normal_t</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>
+, <a class="el" href="structstp__dither__matrix__generic__t.html#ce2509068a38f137997f78ee5f86a3fd">stp_dither_matrix_generic_t</a>
+, <a class="el" href="structstp__dither__matrix__short__t.html#f16fe3d197917c57878a7eb47fb74f89">stp_dither_matrix_short_t</a>
 </ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>category
@@ -89,28 +89,28 @@
 <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>
+: <a class="el" href="structstp__module__t.html#1bd300254cbc047d2c00688cd7777aa3">stp_module_t</a>
 <li>colorfuncs
-: <a class="el" href="structstp__color.html#4442d36d0bcf746130f82ffe6f90147f">stp_color</a>
+: <a class="el" href="structstp__color__t.html#0ab4fc77eeb3eaedcea9c3a522fe5d57">stp_color_t</a>
 <li>comment
-: <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module</a>
+: <a class="el" href="structstp__module__t.html#66daab38c5658cdffd0ebd3c68e3b326">stp_module_t</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>
+: <a class="el" href="structstp__image__t.html#75a8a76ab6d78ba767b21e5ed95827a7">stp_image_t</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>
+: <a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">stp_parameter_t</a>
+, <a class="el" href="structstp__cached__curve__t.html#e9b4170bfafe7d85b36689cbd8eea41e">stp_cached_curve_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#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__dither__matrix__short__t.html#e809b6e6f3abfb477fc01c959050976b">stp_dither_matrix_short_t</a>
+, <a class="el" href="structstp__dither__matrix__generic__t.html#7a5ebd299bf32fb0711c4598610d05b2">stp_dither_matrix_generic_t</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>
+, <a class="el" href="structstp__dither__matrix__normal__t.html#9c84f2864c2f2a07739e87030659b86d">stp_dither_matrix_normal_t</a>
 <li>dbl
 : <a class="el" href="structstp__parameter__t.html#12fc8869d3056687e576af63c6fbd675">stp_parameter_t</a>
 <li>deflt
@@ -124,54 +124,56 @@
 <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>
+: <a class="el" href="structstp__shade__t.html#7ab08079ac4667939bfebfc1454101e8">stp_shade_t</a>
 </ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>element
-: <a class="el" href="unionstp__mxml__value__u.html#d4d8442bb433ac3da208e22ff0eaccf7">stp_mxml_value_u</a>
+: <a class="el" href="unionstp__mxml__value__t.html#96aab65fff9144bb7ac17e525769af31">stp_mxml_value_t</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>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#dfe3c9f5a067437a69bdd83d43f3f804">stp_dither_matrix_impl_t</a>
 </ul>
 <h3><a class="anchor" name="index_f">- f -</a></h3><ul>
 <li>fast_mask
-: <a class="el" href="structdither__matrix__impl.html#8c7141e2e35f6cc14896d23d15a81914">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#524c9ed01e5f7f07d03e808afbeb9883">stp_dither_matrix_impl_t</a>
 <li>fini
-: <a class="el" href="structstp__module.html#e04ff0565f8ebd56b383917b602ffc4a">stp_module</a>
+: <a class="el" href="structstp__module__t.html#2b0e0c7ba523ac34f6a085a3eaaa33f4">stp_module_t</a>
 </ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_appname
-: <a class="el" href="structstp__image.html#56636ad7c0dbf0a82284241f796d95cd">stp_image</a>
+: <a class="el" href="structstp__image__t.html#c8184c887110641206044785fae3f46d">stp_image_t</a>
+<li>get_external_options
+: <a class="el" href="structstp__printfuncs__t.html#1aee9299429a813e60c7c131ccf93c74">stp_printfuncs_t</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>
+, <a class="el" href="structstp__image__t.html#d490679a2b158fcec555d54d7e9bc528">stp_image_t</a>
 </ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>handle
-: <a class="el" href="structstp__module.html#1a96aa2db220972e124717cc6dd03c8e">stp_module</a>
+: <a class="el" href="structstp__module__t.html#f1b13d76a5b44839e773b7ddaf7e73c5">stp_module_t</a>
 <li>height
-: <a class="el" href="structstp__image.html#4977ad211581999a3f3290983929cce9">stp_image</a>
+: <a class="el" href="structstp__image__t.html#687ae4bce9980985adfce7a15af38cde">stp_image_t</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#78152fe120c430f6400b731e5c722bd3">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#1dc9e02e9c08c84879a4432efcfdef40">stp_dither_matrix_impl_t</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>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#808aaba40f97218310e7fec5f8ad3da1">stp_dither_matrix_impl_t</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>
+, <a class="el" href="structstp__image__t.html#96e9c2c9f040fbc66abab45a4b2a79b0">stp_image_t</a>
+, <a class="el" href="structstp__module__t.html#12d502ea2386865bc05fd659bebb974f">stp_module_t</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>
+: <a class="el" href="structstp__parameter__t.html#32ee2ba322a0b7d16520f52ded591cc5">stp_parameter_t</a>
+, <a class="el" href="unionstp__mxml__value__t.html#14551523faecca83828853601e399aee">stp_mxml_value_t</a>
 <li>is_active
 : <a class="el" href="structstp__parameter__t.html#8b1af01f0874c79b6dbc4d0eca432952">stp_parameter_t</a>
 <li>is_mandatory
@@ -185,68 +187,68 @@
 <li>last_child
 : <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>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#f0bb4535de37f2f78378fda1c7228886">stp_dither_matrix_impl_t</a>
 <li>last_x_mod
-: <a class="el" href="structdither__matrix__impl.html#16f516218f0c5a31a1eac49e5c57add5">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#dd3deba1e7c232cb6d4890078dd14fe2">stp_dither_matrix_impl_t</a>
 <li>last_y
-: <a class="el" href="structdither__matrix__impl.html#c1a83c82c364098dce631ec7174574be">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#87a160f3b15be1e006f54dd840b31708">stp_dither_matrix_impl_t</a>
 <li>last_y_mod
-: <a class="el" href="structdither__matrix__impl.html#d03881dd78211b5bcb1a62453c060d2e">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#b14d418c4cd370f340b0a30ef0804952">stp_dither_matrix_impl_t</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>
+: <a class="el" href="structstp__colorfuncs__t.html#14c6ae1a87ba1ba33f88fa71038f9ec9">stp_colorfuncs_t</a>
+, <a class="el" href="structstp__printfuncs__t.html#19dc0ba4351a154cf9450ac4fce1ca1a">stp_printfuncs_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>
+: <a class="el" href="structstp__color__t.html#9680717a1d04dbb522fd3eeb5b4f723b">stp_color_t</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>
+: <a class="el" href="structstp__double__bound__t.html#a00903ee6e04e01b6b2bb7033e3c76ce">stp_double_bound_t</a>
+, <a class="el" href="structstp__int__bound__t.html#c5ae98fad865ad6d4816016e233f5a53">stp_int_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#15add43e03d0e1624f40c083fa958692">stp_module_version</a>
+: <a class="el" href="structstp__module__version__t.html#3395d816d8cb9603ae00220ba74b0d94">stp_module_version_t</a>
 <li>matrix
-: <a class="el" href="structdither__matrix__impl.html#e28102f9e3d3cfb8eb48d9e69e807f96">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#80a41648eea9699edd5c90759caef00c">stp_dither_matrix_impl_t</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>
+: <a class="el" href="structstp__module__version__t.html#616356e2cc969782c10a138dfa06af42">stp_module_version_t</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__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__module__t.html#87a2ab51de6f6860ac0803c0d8114bd7">stp_module_t</a>
+, <a class="el" href="structstp__mxml__attr__t.html#37d8a0891b88e9bbc89f873dfb097682">stp_mxml_attr_t</a>
+, <a class="el" href="structstp__papersize__t.html#660431e579bf100782f7164b45597982">stp_papersize_t</a>
 , <a class="el" href="structstp__param__string__t.html#c4ccea0dded827b9acdb2d22aa25857b">stp_param_string_t</a>
+, <a class="el" href="structstp__mxml__element__t.html#e678ef57706b8b2a5676612e4d5849c4">stp_mxml_element_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__lineactive__t.html#266bdeb14e62fb5b17a31746ad511761">stp_lineactive_t</a>
 , <a class="el" href="structstp__linecount__t.html#69275ad8687438976d07950fa65a1728">stp_linecount_t</a>
+, <a class="el" href="structstp__lineoff__t.html#97c5a2281b3cddb9c546e8299ea4e2b0">stp_lineoff_t</a>
+, <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>
 <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>
+: <a class="el" href="structstp__mxml__element__t.html#d016326e925b78b7c6b951f33500184a">stp_mxml_element_t</a>
 <li>numsizes
-: <a class="el" href="structstp__shade.html#8e68774d99e3eecb76f06f7704f1eb90">stp_shade</a>
+: <a class="el" href="structstp__shade__t.html#06cdc2392609bb5e0fd731b02ad7dc1b">stp_shade_t</a>
 </ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>opaque
-: <a class="el" href="unionstp__mxml__value__u.html#ca8f6bf03f29248dee0b8d364454d051">stp_mxml_value_u</a>
+: <a class="el" href="unionstp__mxml__value__t.html#50776acb8e84f99d12434b8db2d77b2e">stp_mxml_value_t</a>
 </ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>p_class
@@ -268,30 +270,30 @@
 : <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>
+: <a class="el" href="structstp__weave__t.html#aec693e98c7587da452ac604b675be3c">stp_weave_t</a>
+, <a class="el" href="structstp__pass__t.html#0da3d73932d6c07aceaf4bce93cf6163">stp_pass_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>
+: <a class="el" href="structstp__dither__matrix__normal__t.html#04fe7e891c1cb7b4e36b640d29d2616b">stp_dither_matrix_normal_t</a>
+, <a class="el" href="structstp__dither__matrix__generic__t.html#21d0ef7610c911ac9638abc9abac81ad">stp_dither_matrix_generic_t</a>
+, <a class="el" href="structstp__dither__matrix__short__t.html#5cad2ace098daefb612a316c80013c19">stp_dither_matrix_short_t</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>
+: <a class="el" href="structstp__family__t.html#8b71d91daeb9b00d7b0ee3fe28509fe7">stp_family_t</a>
 <li>printfuncs
-: <a class="el" href="structstp__family.html#d29f00ba3565e93c138b00e4a48cde77">stp_family</a>
+: <a class="el" href="structstp__family__t.html#393a6a8182a6ef2e56ef87ea620ef868">stp_family_t</a>
 </ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>read_only
 : <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>
+: <a class="el" href="unionstp__mxml__value__t.html#0f60d52af338d4cbdd09b93879e89b1a">stp_mxml_value_t</a>
 <li>rep
-: <a class="el" href="structstp__image.html#b18e6ee35037589bf485213022e2d871">stp_image</a>
+: <a class="el" href="structstp__image__t.html#e5ba3d09714043232aef970d245182ee">stp_image_t</a>
 <li>reset
-: <a class="el" href="structstp__image.html#7bb2244368c6b1e07d27afb3dd249ffd">stp_image</a>
+: <a class="el" href="structstp__image__t.html#ce331fd802c9c7c65a6538c03aecc0b3">stp_image_t</a>
 <li>right
 : <a class="el" href="structstp__papersize__t.html#6899599f2f940e95e03545ff71e2b4c5">stp_papersize_t</a>
 <li>row
@@ -301,30 +303,30 @@
 <li>s_cache
 : <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>
+: <a class="el" href="structstp__color__t.html#5a0f6f24bbb0048b8c4c0acec3f38500">stp_color_t</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>
+: <a class="el" href="structstp__parameter__t.html#bfe1adab94129fefdafe9e64be135fb6">stp_parameter_t</a>
 <li>string
-: <a class="el" href="structstp__mxml__text__s.html#ef1865e8cab7d5ab175c6e67f122be15">stp_mxml_text_s</a>
+: <a class="el" href="structstp__mxml__text__t.html#82078f046e2331d07df9de1a6d526885">stp_mxml_text_t</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>
+: <a class="el" href="structstp__module__t.html#a9ecb04bec44f6348ccb9c86c1330405">stp_module_t</a>
 </ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>text
-: <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="unionstp__mxml__value__t.html#3f462c7b6567252b1b2fe6eaf029e1cf">stp_mxml_value_t</a>
 , <a class="el" href="structstp__papersize__t.html#26e8b5d0ce282614f128dd9d4aeaf9f6">stp_papersize_t</a>
+, <a class="el" href="structstp__parameter__t.html#396e4980926c200e9ce4454f19e7311a">stp_parameter_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>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#094613ce00d0a095a9affae11be304f7">stp_dither_matrix_impl_t</a>
 <li>type
 : <a class="el" href="structstp__mxml__node__s.html#e1bff9adee67699067516eee014a7510">stp_mxml_node_s</a>
 </ul>
@@ -336,52 +338,52 @@
 <h3><a class="anchor" name="index_v">- v -</a></h3><ul>
 <li>v
 : <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__linebufs__t.html#485ecae7a892476331d31079d33b9891">stp_linebufs_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>
+: <a class="el" href="structstp__mxml__node__s.html#ad44d6b2fe0842de0bbf1312035372cd">stp_mxml_node_s</a>
+, <a class="el" href="structstp__mxml__attr__t.html#9a5667da7d27fa347051fe5f80aeca0e">stp_mxml_attr_t</a>
+, <a class="el" href="structstp__dotsize__t.html#59531e49199b2adacf0944a7ac47359e">stp_dotsize_t</a>
+, <a class="el" href="structstp__shade__t.html#d43f8713d01af090ecb910a8b5538125">stp_shade_t</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>
+: <a class="el" href="structstp__module__t.html#b5ec864c9d2932872dd2ba62c53ba813">stp_module_t</a>
 </ul>
 <h3><a class="anchor" name="index_w">- w -</a></h3><ul>
 <li>whitespace
-: <a class="el" href="structstp__mxml__text__s.html#76bcfbb8c3de4e1c597468d51ef47184">stp_mxml_text_s</a>
+: <a class="el" href="structstp__mxml__text__t.html#10493f8ced34febc9dafc554df0a9db8">stp_mxml_text_t</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>
+, <a class="el" href="structstp__image__t.html#e120f940a46eeb9d8f6a28b03cea88c0">stp_image_t</a>
 </ul>
 <h3><a class="anchor" name="index_x">- x -</a></h3><ul>
 <li>x
 : <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>
+, <a class="el" href="structstp__dither__matrix__short__t.html#f3e1cc731d40f28a67b7cba541f341f5">stp_dither_matrix_short_t</a>
+, <a class="el" href="structstp__dither__matrix__generic__t.html#44cd10631c067bb550173f14368bee2b">stp_dither_matrix_generic_t</a>
+, <a class="el" href="structstp__dither__matrix__normal__t.html#be31b8f8dcc4c48be9c912ed720f63a6">stp_dither_matrix_normal_t</a>
 <li>x_offset
-: <a class="el" href="structdither__matrix__impl.html#665c02056a2d046a15aab462492d9dbc">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#7a22d5818987bbcc0f77254c12519092">stp_dither_matrix_impl_t</a>
 <li>x_size
-: <a class="el" href="structdither__matrix__impl.html#063e3b3617c3a9b4883f3b01cd7dfb48">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#7ce1ac8940686b11ce88494bcc166c5b">stp_dither_matrix_impl_t</a>
 </ul>
 <h3><a class="anchor" name="index_y">- y -</a></h3><ul>
 <li>y
 : <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>
+, <a class="el" href="structstp__dither__matrix__short__t.html#32c82f9dc3fd5fe381a0c5cd6abb073d">stp_dither_matrix_short_t</a>
+, <a class="el" href="structstp__dither__matrix__generic__t.html#2c8fdba16e3d594c2f929c521add0edb">stp_dither_matrix_generic_t</a>
+, <a class="el" href="structstp__dither__matrix__normal__t.html#2247e48b75c8f12fe091e1ce9d9bc14d">stp_dither_matrix_normal_t</a>
 <li>y_offset
-: <a class="el" href="structdither__matrix__impl.html#844cb19ea61f035bc2a21536f6f392c4">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#e975508a01d5d57d589edf14cb3e0bb0">stp_dither_matrix_impl_t</a>
 <li>y_size
-: <a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl</a>
+: <a class="el" href="structstp__dither__matrix__impl__t.html#9cb8ed0493f8966e9929e1a966f0428c">stp_dither_matrix_impl_t</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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals.html b/doc/gutenprint/html/globals.html
index c174a25..35d388b 100644
--- a/doc/gutenprint/html/globals.html
+++ b/doc/gutenprint/html/globals.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -55,8 +55,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x62.html b/doc/gutenprint/html/globals_0x62.html
index f39a4ad..806b909 100644
--- a/doc/gutenprint/html/globals_0x62.html
+++ b/doc/gutenprint/html/globals_0x62.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -53,8 +53,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x63.html b/doc/gutenprint/html/globals_0x63.html
index d31dffd..e011caf 100644
--- a/doc/gutenprint/html/globals_0x63.html
+++ b/doc/gutenprint/html/globals_0x63.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -58,8 +58,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x64.html b/doc/gutenprint/html/globals_0x64.html
index f55eaeb..b89ea5e 100644
--- a/doc/gutenprint/html/globals_0x64.html
+++ b/doc/gutenprint/html/globals_0x64.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -53,11 +53,11 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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>
+: <a class="el" href="group__intl__internal.html#gd24abc7110e1bdf384dc2ef2b63e5d07">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#gd24abc7110e1bdf384dc2ef2b63e5d07">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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x67.html b/doc/gutenprint/html/globals_0x67.html
index 742204b..eb0e70e 100644
--- a/doc/gutenprint/html/globals_0x67.html
+++ b/doc/gutenprint/html/globals_0x67.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -53,8 +53,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x6e.html b/doc/gutenprint/html/globals_0x6e.html
index 726d523..9242edc 100644
--- a/doc/gutenprint/html/globals_0x6e.html
+++ b/doc/gutenprint/html/globals_0x6e.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -53,8 +53,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x70.html b/doc/gutenprint/html/globals_0x70.html
index 136078b..8489e15 100644
--- a/doc/gutenprint/html/globals_0x70.html
+++ b/doc/gutenprint/html/globals_0x70.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -64,8 +64,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x73.html b/doc/gutenprint/html/globals_0x73.html
index 9a20521..5d9461f 100644
--- a/doc/gutenprint/html/globals_0x73.html
+++ b/doc/gutenprint/html/globals_0x73.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -193,8 +193,6 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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
@@ -206,7 +204,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <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>
+: <a class="el" href="group__vars.html#g25e6aec21fd8f8a65c4c4086d0f3dec0">vars.h</a>
 <li>stp_copy_options()
 : <a class="el" href="group__vars.html#gf7d2d5a9897c9ce77bb16f4a1addaa62">vars.h</a>
 <li>STP_CURRENT_INTERFACE
@@ -387,6 +385,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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_PPD
+: <a class="el" href="group__util.html#gb3c2a0be5bea6ef42b720eabde62cd44">util.h</a>
 <li>STP_DBG_PRINTERS
 : <a class="el" href="group__util.html#gdbfb451ebbd246d62bd52e0120fa232b">util.h</a>
 <li>STP_DBG_PS
@@ -437,10 +437,6 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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()
@@ -449,16 +445,12 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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()
@@ -481,8 +473,6 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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
@@ -503,8 +493,6 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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()
@@ -534,7 +522,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <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>
+: <a class="el" href="group__vars.html#g1ac9aa4c059fbb52307d8522a5f1dc6d">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()
@@ -569,6 +557,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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_external_options()
+: <a class="el" href="group__printer.html#gae7a50e6175eed1b84d2e20c924b33ca">printers.h</a>
 <li>stp_get_file_parameter()
 : <a class="el" href="group__vars.html#g2021992d89c92b10138fb012a9554a08">vars.h</a>
 <li>stp_get_file_parameter_active()
@@ -667,8 +657,6 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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()
@@ -751,10 +739,10 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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_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#g87507431ad6b7504b129eafad863cb1f">gutenprint-version.h</a>
 <li>stp_minor_version
@@ -785,26 +773,18 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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
@@ -823,14 +803,10 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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
@@ -880,15 +856,15 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <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>
+: <a class="el" href="group__list.html#g8d8084abc24eb4b00290916d5ff44c1f">list.h</a>
 <li>stp_node_freefunc
-: <a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">list.h</a>
+: <a class="el" href="group__list.html#gc09ea139ad36a6e21f30755439afeab5">list.h</a>
 <li>stp_node_namefunc
-: <a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">list.h</a>
+: <a class="el" href="group__list.html#g815993ed02f7e9c7b5cb4680f0504d97">list.h</a>
 <li>stp_node_sortfunc
-: <a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">list.h</a>
+: <a class="el" href="group__list.html#ge5c7167d6fc957fee0b6aff45bc0b126">list.h</a>
 <li>stp_outfunc_t
-: <a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">vars.h</a>
+: <a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">vars.h</a>
 <li>stp_pack_tiff
 : <a class="el" href="weave_8h.html#525feabe0775e573007678b2da863b24">weave.h</a>
 <li>stp_pack_uncompressed
@@ -1197,8 +1173,6 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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()
@@ -1292,7 +1266,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <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>
+: <a class="el" href="xml_8h.html#fad8ff906c4248935a93794f1b6f8c1a">xml.h</a>
 <li>stp_xml_preinit()
 : <a class="el" href="xml_8h.html#57035ed4be23f4527c9515198bf37a9d">xml.h</a>
 <li>stp_xmldoc_create_generic()
@@ -1316,8 +1290,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x74.html b/doc/gutenprint/html/globals_0x74.html
index 2c57c36..c732eb7 100644
--- a/doc/gutenprint/html/globals_0x74.html
+++ b/doc/gutenprint/html/globals_0x74.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -53,8 +53,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_defs.html b/doc/gutenprint/html/globals_defs.html
index 3ea8a27..480e08e 100644
--- a/doc/gutenprint/html/globals_defs.html
+++ b/doc/gutenprint/html/globals_defs.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -72,8 +72,8 @@
 : <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>
+: <a class="el" href="group__intl__internal.html#gd24abc7110e1bdf384dc2ef2b63e5d07">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#gd24abc7110e1bdf384dc2ef2b63e5d07">gutenprint-intl.h</a>
 </ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>gettext
@@ -124,6 +124,8 @@
 : <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_PPD
+: <a class="el" href="group__util.html#gb3c2a0be5bea6ef42b720eabde62cd44">util.h</a>
 <li>STP_DBG_PRINTERS
 : <a class="el" href="group__util.html#gdbfb451ebbd246d62bd52e0120fa232b">util.h</a>
 <li>STP_DBG_PS
@@ -198,8 +200,8 @@
 : <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_enum.html b/doc/gutenprint/html/globals_enum.html
index b318617..e03e4e0 100644
--- a/doc/gutenprint/html/globals_enum.html
+++ b/doc/gutenprint/html/globals_enum.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -63,8 +63,8 @@
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_eval.html b/doc/gutenprint/html/globals_eval.html
index e937285..553f309 100644
--- a/doc/gutenprint/html/globals_eval.html
+++ b/doc/gutenprint/html/globals_eval.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -167,8 +167,8 @@
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_func.html b/doc/gutenprint/html/globals_func.html
index b828863..4c72e29 100644
--- a/doc/gutenprint/html/globals_func.html
+++ b/doc/gutenprint/html/globals_func.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -433,6 +433,8 @@
 : <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_external_options()
+: <a class="el" href="group__printer.html#gae7a50e6175eed1b84d2e20c924b33ca">printers.h</a>
 <li>stp_get_file_parameter()
 : <a class="el" href="group__vars.html#g2021992d89c92b10138fb012a9554a08">vars.h</a>
 <li>stp_get_file_parameter_active()
@@ -964,8 +966,8 @@
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_type.html b/doc/gutenprint/html/globals_type.html
index 3d5d42c..52d6d94 100644
--- a/doc/gutenprint/html/globals_type.html
+++ b/doc/gutenprint/html/globals_type.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -31,83 +31,45 @@
     <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>
+<ul>
 <li>compdata_t
 : <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#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>
+: <a class="el" href="group__vars.html#g25e6aec21fd8f8a65c4c4086d0f3dec0">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>
+: <a class="el" href="group__vars.html#g1ac9aa4c059fbb52307d8522a5f1dc6d">vars.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>
+: <a class="el" href="group__list.html#g8d8084abc24eb4b00290916d5ff44c1f">list.h</a>
 <li>stp_node_freefunc
-: <a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">list.h</a>
+: <a class="el" href="group__list.html#gc09ea139ad36a6e21f30755439afeab5">list.h</a>
 <li>stp_node_namefunc
-: <a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">list.h</a>
+: <a class="el" href="group__list.html#g815993ed02f7e9c7b5cb4680f0504d97">list.h</a>
 <li>stp_node_sortfunc
-: <a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">list.h</a>
+: <a class="el" href="group__list.html#ge5c7167d6fc957fee0b6aff45bc0b126">list.h</a>
 <li>stp_outfunc_t
-: <a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">vars.h</a>
+: <a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">vars.h</a>
 <li>stp_packfunc
 : <a class="el" href="weave_8h.html#e8aea6782f8e438961332cb7cc18bcdc">weave.h</a>
 <li>stp_parameter_list_t
@@ -116,17 +78,15 @@
 : <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>
+: <a class="el" href="xml_8h.html#fad8ff906c4248935a93794f1b6f8c1a">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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_vars.html b/doc/gutenprint/html/globals_vars.html
index d957a83..af0fae2 100644
--- a/doc/gutenprint/html/globals_vars.html
+++ b/doc/gutenprint/html/globals_vars.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -59,8 +59,8 @@
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__array.html b/doc/gutenprint/html/group__array.html
index 095fba2..8ee1862 100644
--- a/doc/gutenprint/html/group__array.html
+++ b/doc/gutenprint/html/group__array.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -18,7 +18,7 @@
 <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#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct 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="#g26a474575a39c1c36ad520b95aa813b0"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -513,8 +513,8 @@ Resizing an array will destroy all data stored in the array. <dl compact><dt><b>
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__color.html b/doc/gutenprint/html/group__color.html
index e826ea7..cd86269 100644
--- a/doc/gutenprint/html/group__color.html
+++ b/doc/gutenprint/html/group__color.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -20,62 +20,43 @@
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a></td></tr>
 
-<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#gd1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color__t.html">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#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#g23392fc53078d51fcd14d6d565d56423">stp_color_init</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.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#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">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__t.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#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#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#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#g47d6a8163ef21a6e700b1371228b851d">stp_color_register</a> (const <a class="el" href="structstp__color__t.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#g2b62ec8e0afe1b6297bc71466f8a334c">stp_color_unregister</a> (const <a class="el" href="structstp__color__t.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#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="#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="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color__t.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="#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="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color__t.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="#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 <a class="el" href="structstp__color__t.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#g5a4a4da67cb5c3f1c0a2a9618e46ed50">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__t.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="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__t.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="#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="gd1408f9835b72f266ec7c7e1e1202a74"></a><!-- doxytag: member="color.h::stp_color_t" ref="gd1408f9835b72f266ec7c7e1e1202a74" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr><h2>Function Documentation</h2>
+Color modules provide the actual functionality, so different colour management modules may provide the application with different services (for example, colour profiles). <hr><h2>Function Documentation</h2>
 <a class="anchor" name="g68c13c36d723e5604507bf33fe629f8b"></a><!-- doxytag: member="color.h::stp_color_count" ref="g68c13c36d723e5604507bf33fe629f8b" args="(void)" -->
 <div class="memitem">
 <div class="memproto">
@@ -141,7 +122,7 @@ Get the number of available color modules.
         <tr>
           <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="paramtype">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td>
           <td class="paramname"> <em>c</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -169,7 +150,7 @@ Get the long (translated) name of a color module.
         <tr>
           <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="paramtype">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td>
           <td class="paramname"> <em>c</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -203,7 +184,7 @@ Get the short (untranslated) name of a color module.
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
@@ -244,7 +225,7 @@ Get the short (untranslated) name of a color module.
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
@@ -293,7 +274,7 @@ Get the short (untranslated) name of a color module.
         <tr>
           <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="paramtype">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td>
           <td class="paramname"> <em>color</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -313,7 +294,7 @@ Get the short (untranslated) name of a color module.
         <tr>
           <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="paramtype">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td>
           <td class="paramname"> <em>color</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -331,7 +312,7 @@ Get the short (untranslated) name of a color module.
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_colorfuncs           </td>
+          <td class="memname">const <a class="el" href="structstp__color__t.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>
@@ -351,7 +332,7 @@ Get the short (untranslated) name of a color module.
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_index           </td>
+          <td class="memname">const <a class="el" href="structstp__color__t.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>
@@ -379,7 +360,7 @@ Get a color module by its index number.
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_name           </td>
+          <td class="memname">const <a class="el" href="structstp__color__t.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>
@@ -402,8 +383,8 @@ Get a color module by its name.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__curve.html b/doc/gutenprint/html/group__curve.html
index faa725c..d03aded 100644
--- a/doc/gutenprint/html/group__curve.html
+++ b/doc/gutenprint/html/group__curve.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -22,7 +22,7 @@
 
 <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#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct 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="#g375a2b23705fb0698ae1d823243c8524"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
@@ -2082,8 +2082,8 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__image.html b/doc/gutenprint/html/group__image.html
index 2753d6a..c6adab5 100644
--- a/doc/gutenprint/html/group__image.html
+++ b/doc/gutenprint/html/group__image.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -18,16 +18,12 @@
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html">stp_image</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image__t.html">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="structstp__image.html#_details">More...</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="structstp__image__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__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#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="#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#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>
@@ -35,19 +31,19 @@
 
 <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#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#gd257f72ac5272e94ff9314f8ecd24f1e">stp_image_init</a> (<a class="el" href="structstp__image__t.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">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__t.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#gbe86b2ff9a3a0c0e98248990f9be5652">stp_image_width</a> (<a class="el" href="structstp__image__t.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">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__t.html">stp_image_t</a> *image)</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"><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__t.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#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">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__t.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>
+<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__t.html">stp_image_t</a> *image)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
@@ -69,24 +65,6 @@ The image type is an abstract data type for interfacing with the image creation
 The maximum number of channels. 
 </div>
 </div><p>
-<hr><h2>Typedef Documentation</h2>
-<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="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>
-</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. 
-</div>
-</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
 <a class="anchor" name="g58672e1989d582c14328048b207657c8"></a><!-- doxytag: member="image.h::stp_image_status_t" ref="g58672e1989d582c14328048b207657c8" args="" -->
 <div class="memitem">
@@ -121,7 +99,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <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="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -141,7 +119,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <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="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -161,7 +139,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <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="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
@@ -202,7 +180,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <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="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -222,7 +200,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <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="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -242,7 +220,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <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="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -262,7 +240,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <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="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -275,8 +253,8 @@ An error occured, or the job was aborted. </td></tr>
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl.html b/doc/gutenprint/html/group__intl.html
index 0441695..37996a1 100644
--- a/doc/gutenprint/html/group__intl.html
+++ b/doc/gutenprint/html/group__intl.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -189,8 +189,8 @@ The macros defined in this header are convenience wrappers around the gettext fu
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl__internal.html b/doc/gutenprint/html/group__intl__internal.html
index 744de3e..77309c1 100644
--- a/doc/gutenprint/html/group__intl__internal.html
+++ b/doc/gutenprint/html/group__intl__internal.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -189,8 +189,8 @@ The macros defined in this header are convenience wrappers around the gettext fu
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__list.html b/doc/gutenprint/html/group__list.html
index 664b5b8..1092d45 100644
--- a/doc/gutenprint/html/group__list.html
+++ b/doc/gutenprint/html/group__list.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -18,24 +18,25 @@
 <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#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+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="#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="memItemLeft" nowrap align="right" valign="top">typedef struct 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="#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="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gc09ea139ad36a6e21f30755439afeab5">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="#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 free the data a node contains.  <a href="#gc09ea139ad36a6e21f30755439afeab5"></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#g8d8084abc24eb4b00290916d5ff44c1f">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="#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 copy the data a node contains.  <a href="#g8d8084abc24eb4b00290916d5ff44c1f"></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#g815993ed02f7e9c7b5cb4680f0504d97">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="#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 get the name of a node.  <a href="#g815993ed02f7e9c7b5cb4680f0504d97"></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#ge5c7167d6fc957fee0b6aff45bc0b126">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="#gd12571e44981e7acd62137c83652121a"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="#ge5c7167d6fc957fee0b6aff45bc0b126"></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#g55fbb8f7a3920b783b02183c5ea57624">stp_list_node_free_data</a> (void *item)</td></tr>
 
@@ -67,34 +68,34 @@
 <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="#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="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#gc09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a> freefunc)</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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#gc09ea139ad36a6e21f30755439afeab5">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="#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="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#g8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a> copyfunc)</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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g8d8084abc24eb4b00290916d5ff44c1f">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="#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="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#g815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> namefunc)</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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g815993ed02f7e9c7b5cb4680f0504d97">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="#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="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#g815993ed02f7e9c7b5cb4680f0504d97">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="#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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g815993ed02f7e9c7b5cb4680f0504d97">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="#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="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#ge5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a> sortfunc)</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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ge5c7167d6fc957fee0b6aff45bc0b126">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="#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>
@@ -154,12 +155,12 @@ The list opaque data type.
 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 *)" -->
+<a class="anchor" name="g8d8084abc24eb4b00290916d5ff44c1f"></a><!-- doxytag: member="list.h::stp_node_copyfunc" ref="g8d8084abc24eb4b00290916d5ff44c1f" args=")(const void *)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void*(*) <a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">stp_node_copyfunc</a>(const void *)          </td>
+          <td class="memname">typedef void*(* <a class="el" href="group__list.html#g8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a>)(const void *)          </td>
         </tr>
       </table>
 </div>
@@ -171,12 +172,12 @@ A callback function to copy the data a node contains.
 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 *)" -->
+<a class="anchor" name="gc09ea139ad36a6e21f30755439afeab5"></a><!-- doxytag: member="list.h::stp_node_freefunc" ref="gc09ea139ad36a6e21f30755439afeab5" args=")(void *)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void(*) <a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">stp_node_freefunc</a>(void *)          </td>
+          <td class="memname">typedef void(* <a class="el" href="group__list.html#gc09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a>)(void *)          </td>
         </tr>
       </table>
 </div>
@@ -188,12 +189,12 @@ A callback function to free the data a node contains.
 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 *)" -->
+<a class="anchor" name="g815993ed02f7e9c7b5cb4680f0504d97"></a><!-- doxytag: member="list.h::stp_node_namefunc" ref="g815993ed02f7e9c7b5cb4680f0504d97" args=")(const void *)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef const char*(*) <a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a>(const void *)          </td>
+          <td class="memname">typedef const char*(* <a class="el" href="group__list.html#g815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a>)(const void *)          </td>
         </tr>
       </table>
 </div>
@@ -205,12 +206,12 @@ A callback function to get the name of a node.
 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 *)" -->
+<a class="anchor" name="ge5c7167d6fc957fee0b6aff45bc0b126"></a><!-- doxytag: member="list.h::stp_node_sortfunc" ref="ge5c7167d6fc957fee0b6aff45bc0b126" args=")(const void *, const void *)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef int(*) <a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">stp_node_sortfunc</a>(const void *, const void *)          </td>
+          <td class="memname">typedef int(* <a class="el" href="group__list.html#ge5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a>)(const void *, const void *)          </td>
         </tr>
       </table>
 </div>
@@ -307,7 +308,7 @@ It is an error to destroy the list more than once. <dl compact><dt><b>Parameters
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">stp_node_copyfunc</a> stp_list_get_copyfunc           </td>
+          <td class="memname"><a class="el" href="group__list.html#g8d8084abc24eb4b00290916d5ff44c1f">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>
@@ -363,7 +364,7 @@ Find the last item in a list.
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">stp_node_freefunc</a> stp_list_get_freefunc           </td>
+          <td class="memname"><a class="el" href="group__list.html#gc09ea139ad36a6e21f30755439afeab5">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>
@@ -533,7 +534,7 @@ Get the length of a list.
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a> stp_list_get_long_namefunc           </td>
+          <td class="memname"><a class="el" href="group__list.html#g815993ed02f7e9c7b5cb4680f0504d97">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>
@@ -561,7 +562,7 @@ Get a list node long name function.
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a> stp_list_get_namefunc           </td>
+          <td class="memname"><a class="el" href="group__list.html#g815993ed02f7e9c7b5cb4680f0504d97">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>
@@ -589,7 +590,7 @@ Get a list node name function.
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">stp_node_sortfunc</a> stp_list_get_sortfunc           </td>
+          <td class="memname"><a class="el" href="group__list.html#ge5c7167d6fc957fee0b6aff45bc0b126">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>
@@ -886,7 +887,7 @@ This function is indended for use as an stp_node_freefunc, which uses stp_free t
         <tr>
           <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="paramtype"><a class="el" href="group__list.html#g8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a>&nbsp;</td>
           <td class="paramname"> <em>copyfunc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -923,7 +924,7 @@ This callback function will be called whenever a list item is copied. Its intend
         <tr>
           <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="paramtype"><a class="el" href="group__list.html#gc09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a>&nbsp;</td>
           <td class="paramname"> <em>freefunc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -960,7 +961,7 @@ This callback function will be called whenever a list item is destroyed. Its int
         <tr>
           <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="paramtype"><a class="el" href="group__list.html#g815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a>&nbsp;</td>
           <td class="paramname"> <em>long_namefunc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -997,7 +998,7 @@ This callback function will be called whenever the long name of a list item need
         <tr>
           <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="paramtype"><a class="el" href="group__list.html#g815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a>&nbsp;</td>
           <td class="paramname"> <em>namefunc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -1034,7 +1035,7 @@ This callback function will be called whenever the name of a list item needs to
         <tr>
           <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="paramtype"><a class="el" href="group__list.html#ge5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a>&nbsp;</td>
           <td class="paramname"> <em>sortfunc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -1058,8 +1059,8 @@ This callback function will be called to determine the sort order for list items
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__papersize.html b/doc/gutenprint/html/group__papersize.html
index c79e212..6eef787 100644
--- a/doc/gutenprint/html/group__papersize.html
+++ b/doc/gutenprint/html/group__papersize.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -239,8 +239,8 @@ Get the number of available papersizes.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__printer.html b/doc/gutenprint/html/group__printer.html
index 15fb2c1..31e0c61 100644
--- a/doc/gutenprint/html/group__printer.html
+++ b/doc/gutenprint/html/group__printer.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -20,14 +20,13 @@
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a></td></tr>
 
-<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 class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family__t.html">stp_family_t</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#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+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="#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#g6a76f8f76106eddd51af4b1593b4f3af">stp_printer_model_count</a> (void)</td></tr>
 
@@ -68,15 +67,18 @@
 <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="#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="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__t.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="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__t.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="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__t.html">stp_image_t</a> *image)</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"><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="group__printer.html#gae7a50e6175eed1b84d2e20c924b33ca">stp_get_external_options</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">Retrieve options that need to be passed to the underlying print system.  <a href="#gae7a50e6175eed1b84d2e20c924b33ca"></a><br></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#g5b5cb603c9432c03ea459b57a2039bdc">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
@@ -98,21 +100,6 @@
 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="g66a5e7cf2b1743a46bd78cb851e1d0a4"></a><!-- doxytag: member="printers.h::stp_family_t" ref="g66a5e7cf2b1743a46bd78cb851e1d0a4" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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">
@@ -164,7 +151,7 @@ The printer opaque data type (representation of printer model).
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -229,6 +216,34 @@ End a print job.
 
 </div>
 </div><p>
+<a class="anchor" name="gae7a50e6175eed1b84d2e20c924b33ca"></a><!-- doxytag: member="printers.h::stp_get_external_options" ref="gae7a50e6175eed1b84d2e20c924b33ca" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_get_external_options           </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>
+Retrieve options that need to be passed to the underlying print system. 
+<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>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+  </table>
+</dl>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>list of options in a string list ('name' is the name of the option; 'text' is the value it takes on). NULL return means no external options are required. User must stp_string_list_destroy the list after use. </dd></dl>
+
+</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">
@@ -423,7 +438,7 @@ Get the printer index number from the printer model short (driver) name.
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -745,7 +760,7 @@ Set a vars object to use a particular driver, and set the parameter to its defau
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -791,8 +806,8 @@ Start a print job.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__sequence.html b/doc/gutenprint/html/group__sequence.html
index 6c4dc76..6832c4b 100644
--- a/doc/gutenprint/html/group__sequence.html
+++ b/doc/gutenprint/html/group__sequence.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -18,7 +18,8 @@
 <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#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+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="#g327a46aa1d782a4cd53abf306068e272"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -1254,8 +1255,8 @@ Set the data in a sequence from unsigned short values.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__util.html b/doc/gutenprint/html/group__util.html
index d3fa11c..3798a03 100644
--- a/doc/gutenprint/html/group__util.html
+++ b/doc/gutenprint/html/group__util.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -60,6 +60,8 @@
 
 <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#gb3c2a0be5bea6ef42b720eabde62cd44">STP_DBG_PPD</a>&nbsp;&nbsp;&nbsp;0x200000</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>
@@ -365,6 +367,21 @@ Utility functions.
 
 </div>
 </div><p>
+<a class="anchor" name="gb3c2a0be5bea6ef42b720eabde62cd44"></a><!-- doxytag: member="util.h::STP_DBG_PPD" ref="gb3c2a0be5bea6ef42b720eabde62cd44" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define STP_DBG_PPD&nbsp;&nbsp;&nbsp;0x200000          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</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">
@@ -1428,8 +1445,8 @@ This function sets the encoding that all strings translated by gettext are outpu
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__vars.html b/doc/gutenprint/html/group__vars.html
index ad01050..6c81a98 100644
--- a/doc/gutenprint/html/group__vars.html
+++ b/doc/gutenprint/html/group__vars.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -36,7 +36,7 @@
 <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#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct 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="#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>
@@ -45,14 +45,15 @@
 <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="#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="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">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="#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="mdescLeft">&nbsp;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="#g268c87919653380a22b1f69c78fe6555"></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#g25e6aec21fd8f8a65c4c4086d0f3dec0">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#g7974f89cff4cbb5b225d0c4fbb92e9bb">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#g1ac9aa4c059fbb52307d8522a5f1dc6d">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#g4d45b95baae036143e14adfc0014f562">compdata_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+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#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> { <br>
@@ -173,16 +174,16 @@
 <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="#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="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#g268c87919653380a22b1f69c78fe6555">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="#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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">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="#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="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#g268c87919653380a22b1f69c78fe6555">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="#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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">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="#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>
@@ -461,7 +462,7 @@
 <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="#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#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#g25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#g1ac9aa4c059fbb52307d8522a5f1dc6d">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#g151b7d922a3e1e5e9d9f0ea8de6ab70a">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
 
@@ -556,12 +557,12 @@ The constant parameter_list opaque data type.
 
 </div>
 </div><p>
-<a class="anchor" name="g4541229554178e84408cccd89f532cb0"></a><!-- doxytag: member="vars.h::stp_copy_data_func_t" ref="g4541229554178e84408cccd89f532cb0" args="(void *)" -->
+<a class="anchor" name="g25e6aec21fd8f8a65c4c4086d0f3dec0"></a><!-- doxytag: member="vars.h::stp_copy_data_func_t" ref="g25e6aec21fd8f8a65c4c4086d0f3dec0" args=")(void *)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void*(*) <a class="el" href="group__vars.html#g4541229554178e84408cccd89f532cb0">stp_copy_data_func_t</a>(void *)          </td>
+          <td class="memname">typedef void*(* <a class="el" href="group__vars.html#g25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a>)(void *)          </td>
         </tr>
       </table>
 </div>
@@ -571,12 +572,12 @@ The constant parameter_list opaque data type.
 
 </div>
 </div><p>
-<a class="anchor" name="g7974f89cff4cbb5b225d0c4fbb92e9bb"></a><!-- doxytag: member="vars.h::stp_free_data_func_t" ref="g7974f89cff4cbb5b225d0c4fbb92e9bb" args="(void *)" -->
+<a class="anchor" name="g1ac9aa4c059fbb52307d8522a5f1dc6d"></a><!-- doxytag: member="vars.h::stp_free_data_func_t" ref="g1ac9aa4c059fbb52307d8522a5f1dc6d" args=")(void *)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void(*) <a class="el" href="group__vars.html#g7974f89cff4cbb5b225d0c4fbb92e9bb">stp_free_data_func_t</a>(void *)          </td>
+          <td class="memname">typedef void(* <a class="el" href="group__vars.html#g1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a>)(void *)          </td>
         </tr>
       </table>
 </div>
@@ -586,12 +587,12 @@ The constant parameter_list opaque data type.
 
 </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)" -->
+<a class="anchor" name="g268c87919653380a22b1f69c78fe6555"></a><!-- doxytag: member="vars.h::stp_outfunc_t" ref="g268c87919653380a22b1f69c78fe6555" args=")(void *data, const char *buffer, size_t bytes)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname">typedef void(* <a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a>)(void *data, const char *buffer, size_t bytes)          </td>
         </tr>
       </table>
 </div>
@@ -826,13 +827,13 @@ Invalid type (should never be used). </td></tr>
         <tr>
           <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="paramtype"><a class="el" href="group__vars.html#g25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a>&nbsp;</td>
           <td class="paramname"> <em>copyfunc</em>, </td>
         </tr>
         <tr>
           <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="paramtype"><a class="el" href="group__vars.html#g1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a>&nbsp;</td>
           <td class="paramname"> <em>freefunc</em>, </td>
         </tr>
         <tr>
@@ -2193,7 +2194,7 @@ Get the error data.
 <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 class="memname"><a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">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>
@@ -2689,7 +2690,7 @@ Get the output data.
 <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 class="memname"><a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">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>
@@ -4534,7 +4535,7 @@ Set the error data.
         <tr>
           <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="paramtype"><a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a>&nbsp;</td>
           <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -4997,7 +4998,7 @@ Set the output data.
         <tr>
           <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="paramtype"><a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a>&nbsp;</td>
           <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -5610,8 +5611,8 @@ Verify that the parameters selected are consistent with those allowed by the dri
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__version.html b/doc/gutenprint/html/group__version.html
index 54fd342..686e14c 100644
--- a/doc/gutenprint/html/group__version.html
+++ b/doc/gutenprint/html/group__version.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -22,7 +22,7 @@
 
 <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#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#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</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>
 
@@ -157,7 +157,7 @@ Version information may be used to check the library version at compile-time, us
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MICRO_VERSION&nbsp;&nbsp;&nbsp;(1)          </td>
+          <td class="memname">#define STP_MICRO_VERSION&nbsp;&nbsp;&nbsp;(2)          </td>
         </tr>
       </table>
 </div>
@@ -331,8 +331,8 @@ The library minor version number.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </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 a39e055..3b2906d 100644
--- a/doc/gutenprint/html/gutenprint-intl-internal_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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>
+<h1>include/gutenprint/gutenprint-intl-internal.h File Reference</h1><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>
@@ -42,10 +34,8 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Internationalisation functions. 
-<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;
+Internationalisation functions. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-intl_8h.html b/doc/gutenprint/html/gutenprint-intl_8h.html
index b9ac48e..ad75314 100644
--- a/doc/gutenprint/html/gutenprint-intl_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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>
+<h1>include/gutenprint/gutenprint-intl.h File Reference</h1><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>
@@ -42,10 +34,8 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Internationalisation functions. 
-<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;
+Internationalisation functions. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-module_8h.html b/doc/gutenprint/html/gutenprint-module_8h.html
index 8de4492..caeb836 100644
--- a/doc/gutenprint/html/gutenprint-module_8h.html
+++ b/doc/gutenprint/html/gutenprint-module_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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>
+<h1>include/gutenprint/gutenprint-module.h File Reference</h1><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>
 <code>#include &lt;<a class="el" href="channel_8h.html">gutenprint/channel.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="color_8h.html">gutenprint/color.h</a>&gt;</code><br>
@@ -39,9 +31,7 @@
 
 </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>
+Gutenprint module header. 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">
@@ -57,8 +47,8 @@ This header includes all of the public headers used by modules. <hr><h2>Define D
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-version_8h.html b/doc/gutenprint/html/gutenprint-version_8h.html
index 3b3180d..ad45bac 100644
--- a/doc/gutenprint/html/gutenprint-version_8h.html
+++ b/doc/gutenprint/html/gutenprint-version_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,22 +14,14 @@
     <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">
+<h1>include/gutenprint/gutenprint-version.h File Reference</h1><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#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#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#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#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</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>
 
@@ -64,10 +56,8 @@
 <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="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
+Version functions. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint_8h.html b/doc/gutenprint/html/gutenprint_8h.html
index 05530e7..9570b53 100644
--- a/doc/gutenprint/html/gutenprint_8h.html
+++ b/doc/gutenprint/html/gutenprint_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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>
+<h1>include/gutenprint/gutenprint.h File Reference</h1><code>#include &lt;stddef.h&gt;</code><br>
 <code>#include &lt;stdio.h&gt;</code><br>
 <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>
@@ -38,10 +30,8 @@
 <tr><td></td></tr>
 </table>
 <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="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
+Gutenprint master header. This header includes all of the public headers. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/image_8h.html b/doc/gutenprint/html/image_8h.html
index 63e8b60..6f2c5dc 100644
--- a/doc/gutenprint/html/image_8h.html
+++ b/doc/gutenprint/html/image_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,27 +14,15 @@
     <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">
+<h1>include/gutenprint/image.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html">stp_image</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image__t.html">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="structstp__image.html#_details">More...</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="structstp__image__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__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#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#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#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>
@@ -42,26 +30,24 @@
 
 <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#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#gd257f72ac5272e94ff9314f8ecd24f1e">stp_image_init</a> (<a class="el" href="structstp__image__t.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">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__t.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#gbe86b2ff9a3a0c0e98248990f9be5652">stp_image_width</a> (<a class="el" href="structstp__image__t.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">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__t.html">stp_image_t</a> *image)</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"><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__t.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#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">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__t.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>
+<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__t.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="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
+Image functions. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/index.html b/doc/gutenprint/html/index.html
index 57339c5..da85442 100644
--- a/doc/gutenprint/html/index.html
+++ b/doc/gutenprint/html/index.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li class="current"><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -16,8 +16,8 @@
 </div>
 <h1>libgutenprint API Reference Documentation</h1>
 <p>
-<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;
+<h3 align="center">5.0.2 </h3><hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/list_8h.html b/doc/gutenprint/html/list_8h.html
index 9b23c6e..40d39e6 100644
--- a/doc/gutenprint/html/list_8h.html
+++ b/doc/gutenprint/html/list_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,35 +14,28 @@
     <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">
+<h1>include/gutenprint/list.h File Reference</h1><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#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+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#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="memItemLeft" nowrap align="right" valign="top">typedef struct 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#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="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gc09ea139ad36a6e21f30755439afeab5">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#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 free the data a node contains.  <a href="group__list.html#gc09ea139ad36a6e21f30755439afeab5"></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#g8d8084abc24eb4b00290916d5ff44c1f">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#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 copy the data a node contains.  <a href="group__list.html#g8d8084abc24eb4b00290916d5ff44c1f"></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#g815993ed02f7e9c7b5cb4680f0504d97">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#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 get the name of a node.  <a href="group__list.html#g815993ed02f7e9c7b5cb4680f0504d97"></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#ge5c7167d6fc957fee0b6aff45bc0b126">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#gd12571e44981e7acd62137c83652121a"></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#ge5c7167d6fc957fee0b6aff45bc0b126"></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#g55fbb8f7a3920b783b02183c5ea57624">stp_list_node_free_data</a> (void *item)</td></tr>
 
@@ -74,34 +67,34 @@
 <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#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="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#gc09ea139ad36a6e21f30755439afeab5">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#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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#gc09ea139ad36a6e21f30755439afeab5">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#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="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#g8d8084abc24eb4b00290916d5ff44c1f">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#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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g8d8084abc24eb4b00290916d5ff44c1f">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#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="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#g815993ed02f7e9c7b5cb4680f0504d97">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#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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g815993ed02f7e9c7b5cb4680f0504d97">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#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="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#g815993ed02f7e9c7b5cb4680f0504d97">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#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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g815993ed02f7e9c7b5cb4680f0504d97">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#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="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#ge5c7167d6fc957fee0b6aff45bc0b126">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#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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ge5c7167d6fc957fee0b6aff45bc0b126">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#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>
@@ -124,10 +117,8 @@
 <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="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
+Generic list functions. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/module_8h.html b/doc/gutenprint/html/module_8h.html
index 0ff2b5b..cc0622f 100644
--- a/doc/gutenprint/html/module_8h.html
+++ b/doc/gutenprint/html/module_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,26 +14,13 @@
     <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>
+<h1>include/gutenprint/module.h File Reference</h1><code>#include &lt;<a class="el" href="list_8h.html">gutenprint/list.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html">stp_module_version</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version__t.html">stp_module_version_t</a></td></tr>
 
-<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#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#e1e92953e8ffaa00cfbf7fc01e51f36d">stp_module_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__t.html">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#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> { <br>
@@ -61,40 +48,7 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Module functions. 
-<p>
-<hr><h2>Typedef Documentation</h2>
-<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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr><h2>Enumeration Type Documentation</h2>
+Module functions. <hr><h2>Enumeration Type Documentation</h2>
 <a class="anchor" name="b3da7c3525c26e1d63d7fe1f95da5a42"></a><!-- doxytag: member="module.h::stp_module_class_t" ref="b3da7c3525c26e1d63d7fe1f95da5a42" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -245,8 +199,8 @@ Module functions.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/modules.html b/doc/gutenprint/html/modules.html
index ec9f155..c238bcc 100644
--- a/doc/gutenprint/html/modules.html
+++ b/doc/gutenprint/html/modules.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -29,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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/mxml_8h.html b/doc/gutenprint/html/mxml_8h.html
index 2cb10f3..afb05dd 100644
--- a/doc/gutenprint/html/mxml_8h.html
+++ b/doc/gutenprint/html/mxml_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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>
+<h1>include/gutenprint/mxml.h File Reference</h1><code>#include &lt;stdio.h&gt;</code><br>
 <code>#include &lt;stdlib.h&gt;</code><br>
 <code>#include &lt;string.h&gt;</code><br>
 <code>#include &lt;ctype.h&gt;</code><br>
@@ -30,13 +22,13 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__t.html">stp_mxml_attr_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__element__t.html">stp_mxml_element_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__t.html">stp_mxml_text_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">union &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">union &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__t.html">stp_mxml_value_t</a></td></tr>
 
 <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>
 
@@ -70,17 +62,11 @@
 <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#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#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#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#b9c0236a2d70c3bcb210a9f6fadf00a3">stp_mxml_text_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef enum <br>
+<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="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#8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+<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#f8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a> { <br>
@@ -132,9 +118,7 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Mini-XML XML parsing functions. 
-<p>
-<hr><h2>Define Documentation</h2>
+Mini-XML XML parsing functions. <hr><h2>Define Documentation</h2>
 <a class="anchor" name="a046bb0b67f278cb7ffdd0be5336b4f3"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_AFTER" ref="a046bb0b67f278cb7ffdd0be5336b4f3" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -346,36 +330,6 @@ Mini-XML XML parsing functions.
 </div>
 </div><p>
 <hr><h2>Typedef Documentation</h2>
-<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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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">
@@ -391,21 +345,6 @@ Mini-XML XML parsing functions.
 
 </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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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">
@@ -421,21 +360,6 @@ Mini-XML XML parsing functions.
 
 </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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
 <a class="anchor" name="f8b58610b5fb382d0f075cb3bcf3b6ba"></a><!-- doxytag: member="mxml.h::stp_mxml_type_e" ref="f8b58610b5fb382d0f075cb3bcf3b6ba" args="" -->
 <div class="memitem">
@@ -1061,8 +985,8 @@ Mini-XML XML parsing functions.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/pages.html b/doc/gutenprint/html/pages.html
index 0be72df..db98121 100644
--- a/doc/gutenprint/html/pages.html
+++ b/doc/gutenprint/html/pages.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -18,8 +18,8 @@
 <li><a class="el" href="deprecated.html">Deprecated List</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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/paper_8h.html b/doc/gutenprint/html/paper_8h.html
index 303d536..8c1c17c 100644
--- a/doc/gutenprint/html/paper_8h.html
+++ b/doc/gutenprint/html/paper_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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>
+<h1>include/gutenprint/paper.h File Reference</h1><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>Data Structures</h2></td></tr>
@@ -54,10 +46,8 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Paper size functions. 
-<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;
+Paper size functions. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/path_8h.html b/doc/gutenprint/html/path_8h.html
index 64522c4..b0e024a 100644
--- a/doc/gutenprint/html/path_8h.html
+++ b/doc/gutenprint/html/path_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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">
+<h1>include/gutenprint/path.h File Reference</h1><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#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>
@@ -31,9 +23,7 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Simple directory path functions. 
-<p>
-<hr><h2>Function Documentation</h2>
+Simple directory path functions. <hr><h2>Function Documentation</h2>
 <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">
@@ -92,8 +82,8 @@ Simple directory path functions.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/printers_8h.html b/doc/gutenprint/html/printers_8h.html
index 00e3fe0..2e7a25c 100644
--- a/doc/gutenprint/html/printers_8h.html
+++ b/doc/gutenprint/html/printers_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,14 +14,7 @@
     <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>
+<h1>include/gutenprint/printers.h File Reference</h1><code>#include &lt;<a class="el" href="string-list_8h.html">gutenprint/string-list.h</a>&gt;</code><br>
 <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>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -29,14 +22,13 @@
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a></td></tr>
 
-<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 class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family__t.html">stp_family_t</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#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+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#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#g6a76f8f76106eddd51af4b1593b4f3af">stp_printer_model_count</a> (void)</td></tr>
 
@@ -77,15 +69,18 @@
 <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#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="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__t.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="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__t.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="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__t.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#ge61d056dd504facc72ff56d7f16eb23c"></a><br></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="group__printer.html#gae7a50e6175eed1b84d2e20c924b33ca">stp_get_external_options</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">Retrieve options that need to be passed to the underlying print system.  <a href="group__printer.html#gae7a50e6175eed1b84d2e20c924b33ca"></a><br></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#g5b5cb603c9432c03ea459b57a2039bdc">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
@@ -104,10 +99,8 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Printer functions. 
-<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;
+Printer functions. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/sequence_8h.html b/doc/gutenprint/html/sequence_8h.html
index 187cb37..98ef99d 100644
--- a/doc/gutenprint/html/sequence_8h.html
+++ b/doc/gutenprint/html/sequence_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,18 +14,11 @@
     <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">
+<h1>include/gutenprint/sequence.h File Reference</h1><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#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+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#g327a46aa1d782a4cd53abf306068e272"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -115,10 +108,8 @@
 <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="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
+Sequence functions. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/string-list_8h.html b/doc/gutenprint/html/string-list_8h.html
index acaf9d2..7aaab01 100644
--- a/doc/gutenprint/html/string-list_8h.html
+++ b/doc/gutenprint/html/string-list_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,22 +14,15 @@
     <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">
+<h1>include/gutenprint/string-list.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a></td></tr>
 
 <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#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+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="#5e3b69c7c2eca2523184cce51ca26543"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -55,9 +48,7 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-String list functions. 
-<p>
-<hr><h2>Typedef Documentation</h2>
+String list functions. <hr><h2>Typedef Documentation</h2>
 <a class="anchor" name="5e3b69c7c2eca2523184cce51ca26543"></a><!-- doxytag: member="string-list.h::stp_string_list_t" ref="5e3b69c7c2eca2523184cce51ca26543" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -336,8 +327,8 @@ The string_list opaque data type.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structdither__matrix__impl.html b/doc/gutenprint/html/structdither__matrix__impl.html
deleted file mode 100644
index 3e4535e..0000000
--- a/doc/gutenprint/html/structdither__matrix__impl.html
+++ /dev/null
@@ -1,292 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<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.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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#e28102f9e3d3cfb8eb48d9e69e807f96">matrix</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<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="memname">int <a class="el" href="structdither__matrix__impl.html#331debb887e076f8b52952ba6cc2b50b">dither_matrix_impl::base</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">int <a class="el" href="structdither__matrix__impl.html#db0e7fb4b5e5149f0815af448676df8b">dither_matrix_impl::exp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">int <a class="el" href="structdither__matrix__impl.html#063e3b3617c3a9b4883f3b01cd7dfb48">dither_matrix_impl::x_size</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">int <a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl::y_size</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">int <a class="el" href="structdither__matrix__impl.html#54645c1c4edad222cf3f5aba03cdfae5">dither_matrix_impl::total_size</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">int <a class="el" href="structdither__matrix__impl.html#f0728348e6da1cf904204ef88e0a5853">dither_matrix_impl::last_x</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">int <a class="el" href="structdither__matrix__impl.html#16f516218f0c5a31a1eac49e5c57add5">dither_matrix_impl::last_x_mod</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">int <a class="el" href="structdither__matrix__impl.html#c1a83c82c364098dce631ec7174574be">dither_matrix_impl::last_y</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">int <a class="el" href="structdither__matrix__impl.html#d03881dd78211b5bcb1a62453c060d2e">dither_matrix_impl::last_y_mod</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">int <a class="el" href="structdither__matrix__impl.html#b744f40c883acc93ad0afbf5f048f27a">dither_matrix_impl::index</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">int <a class="el" href="structdither__matrix__impl.html#78152fe120c430f6400b731e5c722bd3">dither_matrix_impl::i_own</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">int <a class="el" href="structdither__matrix__impl.html#665c02056a2d046a15aab462492d9dbc">dither_matrix_impl::x_offset</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">int <a class="el" href="structdither__matrix__impl.html#844cb19ea61f035bc2a21536f6f392c4">dither_matrix_impl::y_offset</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">unsigned <a class="el" href="structdither__matrix__impl.html#8c7141e2e35f6cc14896d23d15a81914">dither_matrix_impl::fast_mask</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="memname">unsigned* <a class="el" href="structdither__matrix__impl.html#e28102f9e3d3cfb8eb48d9e69e807f96">dither_matrix_impl::matrix</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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.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 115d1b7..5d655df 100644
--- a/doc/gutenprint/html/structstp__cached__curve__t.html
+++ b/doc/gutenprint/html/structstp__cached__curve__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -98,8 +98,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__color.html b/doc/gutenprint/html/structstp__color__t.html
index b31a233..5dfeafa 100644
--- a/doc/gutenprint/html/structstp__color.html
+++ b/doc/gutenprint/html/structstp__color__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_color Struct Reference</title>
+<title>libgutenprint API Reference: stp_color_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,28 +21,28 @@
     <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
   </ul>
 </div>
-<h1>stp_color Struct Reference<br>
+<h1>stp_color_t Struct Reference<br>
 <small>
 [<a class="el" href="group__color.html">color</a>]</small>
-</h1><!-- doxytag: class="stp_color" --><code>#include &lt;color.h&gt;</code>
+</h1><!-- doxytag: class="stp_color_t" --><code>#include &lt;color.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__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__t.html#5a0f6f24bbb0048b8c4c0acec3f38500">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#b7c0a627b31ebfb97fd1db2677032479">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__t.html#9680717a1d04dbb522fd3eeb5b4f723b">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#4442d36d0bcf746130f82ffe6f90147f">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__t.html#0ab4fc77eeb3eaedcea9c3a522fe5d57">colorfuncs</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="23ed4d11629625e2ad24b124c36c7fab"></a><!-- doxytag: member="stp_color::short_name" ref="23ed4d11629625e2ad24b124c36c7fab" args="" -->
+<a class="anchor" name="5a0f6f24bbb0048b8c4c0acec3f38500"></a><!-- doxytag: member="stp_color_t::short_name" ref="5a0f6f24bbb0048b8c4c0acec3f38500" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__color.html#23ed4d11629625e2ad24b124c36c7fab">stp_color::short_name</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__color__t.html#5a0f6f24bbb0048b8c4c0acec3f38500">stp_color_t::short_name</a>          </td>
         </tr>
       </table>
 </div>
@@ -52,12 +52,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="b7c0a627b31ebfb97fd1db2677032479"></a><!-- doxytag: member="stp_color::long_name" ref="b7c0a627b31ebfb97fd1db2677032479" args="" -->
+<a class="anchor" name="9680717a1d04dbb522fd3eeb5b4f723b"></a><!-- doxytag: member="stp_color_t::long_name" ref="9680717a1d04dbb522fd3eeb5b4f723b" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__color.html#b7c0a627b31ebfb97fd1db2677032479">stp_color::long_name</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__color__t.html#9680717a1d04dbb522fd3eeb5b4f723b">stp_color_t::long_name</a>          </td>
         </tr>
       </table>
 </div>
@@ -67,12 +67,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="4442d36d0bcf746130f82ffe6f90147f"></a><!-- doxytag: member="stp_color::colorfuncs" ref="4442d36d0bcf746130f82ffe6f90147f" args="" -->
+<a class="anchor" name="0ab4fc77eeb3eaedcea9c3a522fe5d57"></a><!-- doxytag: member="stp_color_t::colorfuncs" ref="0ab4fc77eeb3eaedcea9c3a522fe5d57" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>* <a class="el" href="structstp__color__t.html#0ab4fc77eeb3eaedcea9c3a522fe5d57">stp_color_t::colorfuncs</a>          </td>
         </tr>
       </table>
 </div>
@@ -84,8 +84,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__colorfuncs__t.html b/doc/gutenprint/html/structstp__colorfuncs__t.html
index df0fc6d..6a0a66c 100644
--- a/doc/gutenprint/html/structstp__colorfuncs__t.html
+++ b/doc/gutenprint/html/structstp__colorfuncs__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -29,9 +29,9 @@
 <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#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#a10cf47dc6db374ef209d0d96592b1fe">init</a> )(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.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#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">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__t.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#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>
 
@@ -44,7 +44,7 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <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__t.html">stp_image_t</a> *image, size_t steps)          </td>
         </tr>
       </table>
 </div>
@@ -59,7 +59,7 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <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__t.html">stp_image_t</a> *image, int row, unsigned *zero_mask)          </td>
         </tr>
       </table>
 </div>
@@ -101,8 +101,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </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 6bdfdd7..ab93c29 100644
--- a/doc/gutenprint/html/structstp__curve__point__t.html
+++ b/doc/gutenprint/html/structstp__curve__point__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -42,8 +42,6 @@
 <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="92b13b94109b1270563a1116dc19b926"></a><!-- doxytag: member="stp_curve_point_t::x" ref="92b13b94109b1270563a1116dc19b926" args="" -->
 <div class="memitem">
@@ -81,8 +79,8 @@ Vertical position.
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__generic.html b/doc/gutenprint/html/structstp__dither__matrix__generic__t.html
index 630053a..782b81c 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__generic.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__generic__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_dither_matrix_generic Struct Reference</title>
+<title>libgutenprint API Reference: stp_dither_matrix_generic_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,29 +21,29 @@
     <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>
+<h1>stp_dither_matrix_generic_t Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_generic_t" --><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#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__t.html#44cd10631c067bb550173f14368bee2b">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#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__t.html#2c8fdba16e3d594c2f929c521add0edb">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#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__t.html#ce2509068a38f137997f78ee5f86a3fd">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#478d54ddf9ba50e783ddec1532a0eff6">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__t.html#21d0ef7610c911ac9638abc9abac81ad">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#52acbda296a57a6087852eab62bc62db">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__t.html#7a5ebd299bf32fb0711c4598610d05b2">data</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="6b8bd1cc589c2195f055e5a57a05e03a"></a><!-- doxytag: member="stp_dither_matrix_generic::x" ref="6b8bd1cc589c2195f055e5a57a05e03a" args="" -->
+<a class="anchor" name="44cd10631c067bb550173f14368bee2b"></a><!-- doxytag: member="stp_dither_matrix_generic_t::x" ref="44cd10631c067bb550173f14368bee2b" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#6b8bd1cc589c2195f055e5a57a05e03a">stp_dither_matrix_generic::x</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic__t.html#44cd10631c067bb550173f14368bee2b">stp_dither_matrix_generic_t::x</a>          </td>
         </tr>
       </table>
 </div>
@@ -53,12 +53,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="aaddcac2ca33a3e822ded567bbbecfb9"></a><!-- doxytag: member="stp_dither_matrix_generic::y" ref="aaddcac2ca33a3e822ded567bbbecfb9" args="" -->
+<a class="anchor" name="2c8fdba16e3d594c2f929c521add0edb"></a><!-- doxytag: member="stp_dither_matrix_generic_t::y" ref="2c8fdba16e3d594c2f929c521add0edb" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#aaddcac2ca33a3e822ded567bbbecfb9">stp_dither_matrix_generic::y</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic__t.html#2c8fdba16e3d594c2f929c521add0edb">stp_dither_matrix_generic_t::y</a>          </td>
         </tr>
       </table>
 </div>
@@ -68,12 +68,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="b963ddf7c0826bd3cc316c2375f1205b"></a><!-- doxytag: member="stp_dither_matrix_generic::bytes" ref="b963ddf7c0826bd3cc316c2375f1205b" args="" -->
+<a class="anchor" name="ce2509068a38f137997f78ee5f86a3fd"></a><!-- doxytag: member="stp_dither_matrix_generic_t::bytes" ref="ce2509068a38f137997f78ee5f86a3fd" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#b963ddf7c0826bd3cc316c2375f1205b">stp_dither_matrix_generic::bytes</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic__t.html#ce2509068a38f137997f78ee5f86a3fd">stp_dither_matrix_generic_t::bytes</a>          </td>
         </tr>
       </table>
 </div>
@@ -83,12 +83,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="478d54ddf9ba50e783ddec1532a0eff6"></a><!-- doxytag: member="stp_dither_matrix_generic::prescaled" ref="478d54ddf9ba50e783ddec1532a0eff6" args="" -->
+<a class="anchor" name="21d0ef7610c911ac9638abc9abac81ad"></a><!-- doxytag: member="stp_dither_matrix_generic_t::prescaled" ref="21d0ef7610c911ac9638abc9abac81ad" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#478d54ddf9ba50e783ddec1532a0eff6">stp_dither_matrix_generic::prescaled</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic__t.html#21d0ef7610c911ac9638abc9abac81ad">stp_dither_matrix_generic_t::prescaled</a>          </td>
         </tr>
       </table>
 </div>
@@ -98,12 +98,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="52acbda296a57a6087852eab62bc62db"></a><!-- doxytag: member="stp_dither_matrix_generic::data" ref="52acbda296a57a6087852eab62bc62db" args="" -->
+<a class="anchor" name="7a5ebd299bf32fb0711c4598610d05b2"></a><!-- doxytag: member="stp_dither_matrix_generic_t::data" ref="7a5ebd299bf32fb0711c4598610d05b2" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const void* <a class="el" href="structstp__dither__matrix__generic.html#52acbda296a57a6087852eab62bc62db">stp_dither_matrix_generic::data</a>          </td>
+          <td class="memname">const void* <a class="el" href="structstp__dither__matrix__generic__t.html#7a5ebd299bf32fb0711c4598610d05b2">stp_dither_matrix_generic_t::data</a>          </td>
         </tr>
       </table>
 </div>
@@ -115,8 +115,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__impl__t.html b/doc/gutenprint/html/structstp__dither__matrix__impl__t.html
new file mode 100644
index 0000000..e3b215d
--- /dev/null
+++ b/doc/gutenprint/html/structstp__dither__matrix__impl__t.html
@@ -0,0 +1,292 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: stp_dither_matrix_impl_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.5.3 -->
+<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_impl_t Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_impl_t" --><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__impl__t.html#77db65014dea5548e6954ee4a76b7fd7">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="structstp__dither__matrix__impl__t.html#dfe3c9f5a067437a69bdd83d43f3f804">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="structstp__dither__matrix__impl__t.html#7ce1ac8940686b11ce88494bcc166c5b">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="structstp__dither__matrix__impl__t.html#9cb8ed0493f8966e9929e1a966f0428c">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="structstp__dither__matrix__impl__t.html#094613ce00d0a095a9affae11be304f7">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="structstp__dither__matrix__impl__t.html#f0bb4535de37f2f78378fda1c7228886">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="structstp__dither__matrix__impl__t.html#dd3deba1e7c232cb6d4890078dd14fe2">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="structstp__dither__matrix__impl__t.html#87a160f3b15be1e006f54dd840b31708">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="structstp__dither__matrix__impl__t.html#b14d418c4cd370f340b0a30ef0804952">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="structstp__dither__matrix__impl__t.html#808aaba40f97218310e7fec5f8ad3da1">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="structstp__dither__matrix__impl__t.html#1dc9e02e9c08c84879a4432efcfdef40">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="structstp__dither__matrix__impl__t.html#7a22d5818987bbcc0f77254c12519092">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="structstp__dither__matrix__impl__t.html#e975508a01d5d57d589edf14cb3e0bb0">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="structstp__dither__matrix__impl__t.html#524c9ed01e5f7f07d03e808afbeb9883">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="structstp__dither__matrix__impl__t.html#80a41648eea9699edd5c90759caef00c">matrix</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="77db65014dea5548e6954ee4a76b7fd7"></a><!-- doxytag: member="stp_dither_matrix_impl_t::base" ref="77db65014dea5548e6954ee4a76b7fd7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#77db65014dea5548e6954ee4a76b7fd7">stp_dither_matrix_impl_t::base</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="dfe3c9f5a067437a69bdd83d43f3f804"></a><!-- doxytag: member="stp_dither_matrix_impl_t::exp" ref="dfe3c9f5a067437a69bdd83d43f3f804" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#dfe3c9f5a067437a69bdd83d43f3f804">stp_dither_matrix_impl_t::exp</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="7ce1ac8940686b11ce88494bcc166c5b"></a><!-- doxytag: member="stp_dither_matrix_impl_t::x_size" ref="7ce1ac8940686b11ce88494bcc166c5b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#7ce1ac8940686b11ce88494bcc166c5b">stp_dither_matrix_impl_t::x_size</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="9cb8ed0493f8966e9929e1a966f0428c"></a><!-- doxytag: member="stp_dither_matrix_impl_t::y_size" ref="9cb8ed0493f8966e9929e1a966f0428c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#9cb8ed0493f8966e9929e1a966f0428c">stp_dither_matrix_impl_t::y_size</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="094613ce00d0a095a9affae11be304f7"></a><!-- doxytag: member="stp_dither_matrix_impl_t::total_size" ref="094613ce00d0a095a9affae11be304f7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#094613ce00d0a095a9affae11be304f7">stp_dither_matrix_impl_t::total_size</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="f0bb4535de37f2f78378fda1c7228886"></a><!-- doxytag: member="stp_dither_matrix_impl_t::last_x" ref="f0bb4535de37f2f78378fda1c7228886" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#f0bb4535de37f2f78378fda1c7228886">stp_dither_matrix_impl_t::last_x</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="dd3deba1e7c232cb6d4890078dd14fe2"></a><!-- doxytag: member="stp_dither_matrix_impl_t::last_x_mod" ref="dd3deba1e7c232cb6d4890078dd14fe2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#dd3deba1e7c232cb6d4890078dd14fe2">stp_dither_matrix_impl_t::last_x_mod</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="87a160f3b15be1e006f54dd840b31708"></a><!-- doxytag: member="stp_dither_matrix_impl_t::last_y" ref="87a160f3b15be1e006f54dd840b31708" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#87a160f3b15be1e006f54dd840b31708">stp_dither_matrix_impl_t::last_y</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="b14d418c4cd370f340b0a30ef0804952"></a><!-- doxytag: member="stp_dither_matrix_impl_t::last_y_mod" ref="b14d418c4cd370f340b0a30ef0804952" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#b14d418c4cd370f340b0a30ef0804952">stp_dither_matrix_impl_t::last_y_mod</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="808aaba40f97218310e7fec5f8ad3da1"></a><!-- doxytag: member="stp_dither_matrix_impl_t::index" ref="808aaba40f97218310e7fec5f8ad3da1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#808aaba40f97218310e7fec5f8ad3da1">stp_dither_matrix_impl_t::index</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="1dc9e02e9c08c84879a4432efcfdef40"></a><!-- doxytag: member="stp_dither_matrix_impl_t::i_own" ref="1dc9e02e9c08c84879a4432efcfdef40" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#1dc9e02e9c08c84879a4432efcfdef40">stp_dither_matrix_impl_t::i_own</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="7a22d5818987bbcc0f77254c12519092"></a><!-- doxytag: member="stp_dither_matrix_impl_t::x_offset" ref="7a22d5818987bbcc0f77254c12519092" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#7a22d5818987bbcc0f77254c12519092">stp_dither_matrix_impl_t::x_offset</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="e975508a01d5d57d589edf14cb3e0bb0"></a><!-- doxytag: member="stp_dither_matrix_impl_t::y_offset" ref="e975508a01d5d57d589edf14cb3e0bb0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#e975508a01d5d57d589edf14cb3e0bb0">stp_dither_matrix_impl_t::y_offset</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="524c9ed01e5f7f07d03e808afbeb9883"></a><!-- doxytag: member="stp_dither_matrix_impl_t::fast_mask" ref="524c9ed01e5f7f07d03e808afbeb9883" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned <a class="el" href="structstp__dither__matrix__impl__t.html#524c9ed01e5f7f07d03e808afbeb9883">stp_dither_matrix_impl_t::fast_mask</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="80a41648eea9699edd5c90759caef00c"></a><!-- doxytag: member="stp_dither_matrix_impl_t::matrix" ref="80a41648eea9699edd5c90759caef00c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned* <a class="el" href="structstp__dither__matrix__impl__t.html#80a41648eea9699edd5c90759caef00c">stp_dither_matrix_impl_t::matrix</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</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="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.3 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__normal.html b/doc/gutenprint/html/structstp__dither__matrix__normal__t.html
index f0ea672..638b58c 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__normal.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__normal__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_dither_matrix_normal Struct Reference</title>
+<title>libgutenprint API Reference: stp_dither_matrix_normal_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,29 +21,29 @@
     <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>
+<h1>stp_dither_matrix_normal_t Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_normal_t" --><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#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__t.html#be31b8f8dcc4c48be9c912ed720f63a6">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#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__t.html#2247e48b75c8f12fe091e1ce9d9bc14d">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#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__t.html#4e85b66600eecdb606761d97e8263931">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#042561ad856d67506fe81b1bbbffd966">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__t.html#04fe7e891c1cb7b4e36b640d29d2616b">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#e67cb37136c5e9d9c4b1a44cd2dab87b">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__t.html#9c84f2864c2f2a07739e87030659b86d">data</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="b9564690be42859d88ea264a29321af3"></a><!-- doxytag: member="stp_dither_matrix_normal::x" ref="b9564690be42859d88ea264a29321af3" args="" -->
+<a class="anchor" name="be31b8f8dcc4c48be9c912ed720f63a6"></a><!-- doxytag: member="stp_dither_matrix_normal_t::x" ref="be31b8f8dcc4c48be9c912ed720f63a6" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#b9564690be42859d88ea264a29321af3">stp_dither_matrix_normal::x</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal__t.html#be31b8f8dcc4c48be9c912ed720f63a6">stp_dither_matrix_normal_t::x</a>          </td>
         </tr>
       </table>
 </div>
@@ -53,12 +53,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="410560f5186761cb7430f5b0a804b09c"></a><!-- doxytag: member="stp_dither_matrix_normal::y" ref="410560f5186761cb7430f5b0a804b09c" args="" -->
+<a class="anchor" name="2247e48b75c8f12fe091e1ce9d9bc14d"></a><!-- doxytag: member="stp_dither_matrix_normal_t::y" ref="2247e48b75c8f12fe091e1ce9d9bc14d" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#410560f5186761cb7430f5b0a804b09c">stp_dither_matrix_normal::y</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal__t.html#2247e48b75c8f12fe091e1ce9d9bc14d">stp_dither_matrix_normal_t::y</a>          </td>
         </tr>
       </table>
 </div>
@@ -68,12 +68,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="d72d088edfe3223c2df8fd4fb6178b98"></a><!-- doxytag: member="stp_dither_matrix_normal::bytes" ref="d72d088edfe3223c2df8fd4fb6178b98" args="" -->
+<a class="anchor" name="4e85b66600eecdb606761d97e8263931"></a><!-- doxytag: member="stp_dither_matrix_normal_t::bytes" ref="4e85b66600eecdb606761d97e8263931" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#d72d088edfe3223c2df8fd4fb6178b98">stp_dither_matrix_normal::bytes</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal__t.html#4e85b66600eecdb606761d97e8263931">stp_dither_matrix_normal_t::bytes</a>          </td>
         </tr>
       </table>
 </div>
@@ -83,12 +83,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="042561ad856d67506fe81b1bbbffd966"></a><!-- doxytag: member="stp_dither_matrix_normal::prescaled" ref="042561ad856d67506fe81b1bbbffd966" args="" -->
+<a class="anchor" name="04fe7e891c1cb7b4e36b640d29d2616b"></a><!-- doxytag: member="stp_dither_matrix_normal_t::prescaled" ref="04fe7e891c1cb7b4e36b640d29d2616b" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#042561ad856d67506fe81b1bbbffd966">stp_dither_matrix_normal::prescaled</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal__t.html#04fe7e891c1cb7b4e36b640d29d2616b">stp_dither_matrix_normal_t::prescaled</a>          </td>
         </tr>
       </table>
 </div>
@@ -98,12 +98,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="e67cb37136c5e9d9c4b1a44cd2dab87b"></a><!-- doxytag: member="stp_dither_matrix_normal::data" ref="e67cb37136c5e9d9c4b1a44cd2dab87b" args="" -->
+<a class="anchor" name="9c84f2864c2f2a07739e87030659b86d"></a><!-- doxytag: member="stp_dither_matrix_normal_t::data" ref="9c84f2864c2f2a07739e87030659b86d" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const unsigned* <a class="el" href="structstp__dither__matrix__normal.html#e67cb37136c5e9d9c4b1a44cd2dab87b">stp_dither_matrix_normal::data</a>          </td>
+          <td class="memname">const unsigned* <a class="el" href="structstp__dither__matrix__normal__t.html#9c84f2864c2f2a07739e87030659b86d">stp_dither_matrix_normal_t::data</a>          </td>
         </tr>
       </table>
 </div>
@@ -115,8 +115,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__short.html b/doc/gutenprint/html/structstp__dither__matrix__short__t.html
index ae5e4c0..dabfa23 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__short.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__short__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_dither_matrix_short Struct Reference</title>
+<title>libgutenprint API Reference: stp_dither_matrix_short_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,29 +21,29 @@
     <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>
+<h1>stp_dither_matrix_short_t Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_short_t" --><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#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__t.html#f3e1cc731d40f28a67b7cba541f341f5">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#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__t.html#32c82f9dc3fd5fe381a0c5cd6abb073d">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#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__t.html#f16fe3d197917c57878a7eb47fb74f89">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#755361acae80fa4cba01a1cc71638274">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__t.html#5cad2ace098daefb612a316c80013c19">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#f4f6b5634ea79cf694782e35a8d7607d">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__t.html#e809b6e6f3abfb477fc01c959050976b">data</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="81e0b20e763080b79faa837a00cac832"></a><!-- doxytag: member="stp_dither_matrix_short::x" ref="81e0b20e763080b79faa837a00cac832" args="" -->
+<a class="anchor" name="f3e1cc731d40f28a67b7cba541f341f5"></a><!-- doxytag: member="stp_dither_matrix_short_t::x" ref="f3e1cc731d40f28a67b7cba541f341f5" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#81e0b20e763080b79faa837a00cac832">stp_dither_matrix_short::x</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__short__t.html#f3e1cc731d40f28a67b7cba541f341f5">stp_dither_matrix_short_t::x</a>          </td>
         </tr>
       </table>
 </div>
@@ -53,12 +53,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="2bbc6c72006541250ba23b48bcab60e8"></a><!-- doxytag: member="stp_dither_matrix_short::y" ref="2bbc6c72006541250ba23b48bcab60e8" args="" -->
+<a class="anchor" name="32c82f9dc3fd5fe381a0c5cd6abb073d"></a><!-- doxytag: member="stp_dither_matrix_short_t::y" ref="32c82f9dc3fd5fe381a0c5cd6abb073d" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#2bbc6c72006541250ba23b48bcab60e8">stp_dither_matrix_short::y</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__short__t.html#32c82f9dc3fd5fe381a0c5cd6abb073d">stp_dither_matrix_short_t::y</a>          </td>
         </tr>
       </table>
 </div>
@@ -68,12 +68,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="d4d85727401505eab74e3e667f4a38f4"></a><!-- doxytag: member="stp_dither_matrix_short::bytes" ref="d4d85727401505eab74e3e667f4a38f4" args="" -->
+<a class="anchor" name="f16fe3d197917c57878a7eb47fb74f89"></a><!-- doxytag: member="stp_dither_matrix_short_t::bytes" ref="f16fe3d197917c57878a7eb47fb74f89" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#d4d85727401505eab74e3e667f4a38f4">stp_dither_matrix_short::bytes</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__short__t.html#f16fe3d197917c57878a7eb47fb74f89">stp_dither_matrix_short_t::bytes</a>          </td>
         </tr>
       </table>
 </div>
@@ -83,12 +83,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="755361acae80fa4cba01a1cc71638274"></a><!-- doxytag: member="stp_dither_matrix_short::prescaled" ref="755361acae80fa4cba01a1cc71638274" args="" -->
+<a class="anchor" name="5cad2ace098daefb612a316c80013c19"></a><!-- doxytag: member="stp_dither_matrix_short_t::prescaled" ref="5cad2ace098daefb612a316c80013c19" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#755361acae80fa4cba01a1cc71638274">stp_dither_matrix_short::prescaled</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__short__t.html#5cad2ace098daefb612a316c80013c19">stp_dither_matrix_short_t::prescaled</a>          </td>
         </tr>
       </table>
 </div>
@@ -98,12 +98,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="f4f6b5634ea79cf694782e35a8d7607d"></a><!-- doxytag: member="stp_dither_matrix_short::data" ref="f4f6b5634ea79cf694782e35a8d7607d" args="" -->
+<a class="anchor" name="e809b6e6f3abfb477fc01c959050976b"></a><!-- doxytag: member="stp_dither_matrix_short_t::data" ref="e809b6e6f3abfb477fc01c959050976b" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const unsigned short* <a class="el" href="structstp__dither__matrix__short.html#f4f6b5634ea79cf694782e35a8d7607d">stp_dither_matrix_short::data</a>          </td>
+          <td class="memname">const unsigned short* <a class="el" href="structstp__dither__matrix__short__t.html#e809b6e6f3abfb477fc01c959050976b">stp_dither_matrix_short_t::data</a>          </td>
         </tr>
       </table>
 </div>
@@ -115,8 +115,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dotsize.html b/doc/gutenprint/html/structstp__dotsize__t.html
index 9ce0441..5ae4d72 100644
--- a/doc/gutenprint/html/structstp__dotsize.html
+++ b/doc/gutenprint/html/structstp__dotsize__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_dotsize Struct Reference</title>
+<title>libgutenprint API Reference: stp_dotsize_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,23 +21,23 @@
     <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>
+<h1>stp_dotsize_t Struct Reference</h1><!-- doxytag: class="stp_dotsize_t" --><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#8d5273395d0e27004f779de0ea81ff23">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__t.html#1b77e2dff6771aeeb5ebccdc23a04314">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#d259e8d169a7d140e4964b80790c7ddd">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__t.html#59531e49199b2adacf0944a7ac47359e">value</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="8d5273395d0e27004f779de0ea81ff23"></a><!-- doxytag: member="stp_dotsize::bit_pattern" ref="8d5273395d0e27004f779de0ea81ff23" args="" -->
+<a class="anchor" name="1b77e2dff6771aeeb5ebccdc23a04314"></a><!-- doxytag: member="stp_dotsize_t::bit_pattern" ref="1b77e2dff6771aeeb5ebccdc23a04314" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned <a class="el" href="structstp__dotsize.html#8d5273395d0e27004f779de0ea81ff23">stp_dotsize::bit_pattern</a>          </td>
+          <td class="memname">unsigned <a class="el" href="structstp__dotsize__t.html#1b77e2dff6771aeeb5ebccdc23a04314">stp_dotsize_t::bit_pattern</a>          </td>
         </tr>
       </table>
 </div>
@@ -47,12 +47,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="d259e8d169a7d140e4964b80790c7ddd"></a><!-- doxytag: member="stp_dotsize::value" ref="d259e8d169a7d140e4964b80790c7ddd" args="" -->
+<a class="anchor" name="59531e49199b2adacf0944a7ac47359e"></a><!-- doxytag: member="stp_dotsize_t::value" ref="59531e49199b2adacf0944a7ac47359e" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">double <a class="el" href="structstp__dotsize.html#d259e8d169a7d140e4964b80790c7ddd">stp_dotsize::value</a>          </td>
+          <td class="memname">double <a class="el" href="structstp__dotsize__t.html#59531e49199b2adacf0944a7ac47359e">stp_dotsize_t::value</a>          </td>
         </tr>
       </table>
 </div>
@@ -64,8 +64,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </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 906e2b2..e121069 100644
--- a/doc/gutenprint/html/structstp__double__bound__t.html
+++ b/doc/gutenprint/html/structstp__double__bound__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -40,8 +40,6 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 double_bound (range) parameter. 
 <p>
-
-<p>
 <hr><h2>Field Documentation</h2>
 <a class="anchor" name="a00903ee6e04e01b6b2bb7033e3c76ce"></a><!-- doxytag: member="stp_double_bound_t::lower" ref="a00903ee6e04e01b6b2bb7033e3c76ce" args="" -->
 <div class="memitem">
@@ -75,8 +73,8 @@ Upper bound.
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__family.html b/doc/gutenprint/html/structstp__family__t.html
index 01c46d1..6814bd3 100644
--- a/doc/gutenprint/html/structstp__family.html
+++ b/doc/gutenprint/html/structstp__family__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_family Struct Reference</title>
+<title>libgutenprint API Reference: stp_family_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,26 +21,26 @@
     <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
   </ul>
 </div>
-<h1>stp_family Struct Reference<br>
+<h1>stp_family_t Struct Reference<br>
 <small>
 [<a class="el" href="group__printer.html">printer</a>]</small>
-</h1><!-- doxytag: class="stp_family" --><code>#include &lt;printers.h&gt;</code>
+</h1><!-- doxytag: class="stp_family_t" --><code>#include &lt;printers.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 <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">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__t.html#393a6a8182a6ef2e56ef87ea620ef868">printfuncs</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>
+<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__t.html#8b71d91daeb9b00d7b0ee3fe28509fe7">printer_list</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="d29f00ba3565e93c138b00e4a48cde77"></a><!-- doxytag: member="stp_family::printfuncs" ref="d29f00ba3565e93c138b00e4a48cde77" args="" -->
+<a class="anchor" name="393a6a8182a6ef2e56ef87ea620ef868"></a><!-- doxytag: member="stp_family_t::printfuncs" ref="393a6a8182a6ef2e56ef87ea620ef868" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>* <a class="el" href="structstp__family__t.html#393a6a8182a6ef2e56ef87ea620ef868">stp_family_t::printfuncs</a>          </td>
         </tr>
       </table>
 </div>
@@ -50,12 +50,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="6e4f0c216f5ced14a819fbacdb26547d"></a><!-- doxytag: member="stp_family::printer_list" ref="6e4f0c216f5ced14a819fbacdb26547d" args="" -->
+<a class="anchor" name="8b71d91daeb9b00d7b0ee3fe28509fe7"></a><!-- doxytag: member="stp_family_t::printer_list" ref="8b71d91daeb9b00d7b0ee3fe28509fe7" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>* <a class="el" href="structstp__family__t.html#8b71d91daeb9b00d7b0ee3fe28509fe7">stp_family_t::printer_list</a>          </td>
         </tr>
       </table>
 </div>
@@ -67,8 +67,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__image.html b/doc/gutenprint/html/structstp__image__t.html
index 66376f7..165b008 100644
--- a/doc/gutenprint/html/structstp__image.html
+++ b/doc/gutenprint/html/structstp__image__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_image Struct Reference</title>
+<title>libgutenprint API Reference: stp_image_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,10 +21,10 @@
     <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
   </ul>
 </div>
-<h1>stp_image Struct Reference<br>
+<h1>stp_image_t Struct Reference<br>
 <small>
 [<a class="el" href="group__image.html">image</a>]</small>
-</h1><!-- doxytag: class="stp_image" -->The image type is an abstract data type for interfacing with the image creation program.  
+</h1><!-- doxytag: class="stp_image_t" -->The image type is an abstract data type for interfacing with the image creation program.  
 <a href="#_details">More...</a>
 <p>
 <code>#include &lt;image.h&gt;</code>
@@ -32,43 +32,41 @@
 <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#ce69bf25344a814cabea38afa4527086">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__t.html#96e9c2c9f040fbc66abab45a4b2a79b0">init</a> )(struct stp_image *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 used to perform any initialization required by the image layer for the image.  <a href="#96e9c2c9f040fbc66abab45a4b2a79b0"></a><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__t.html#ce331fd802c9c7c65a6538c03aecc0b3">reset</a> )(struct stp_image *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 is called to reset the image to the beginning.  <a href="#ce331fd802c9c7c65a6538c03aecc0b3"></a><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__t.html#e120f940a46eeb9d8f6a28b03cea88c0">width</a> )(struct stp_image *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 width of the image in pixels.  <a href="#e120f940a46eeb9d8f6a28b03cea88c0"></a><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__t.html#687ae4bce9980985adfce7a15af38cde">height</a> )(struct stp_image *image)</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 returns the height of the image in pixels.  <a href="#687ae4bce9980985adfce7a15af38cde"></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__t.html#d490679a2b158fcec555d54d7e9bc528">get_row</a> )(struct stp_image *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="#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 transfers the data from the image to the gimp-print library.  <a href="#d490679a2b158fcec555d54d7e9bc528"></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__t.html#c8184c887110641206044785fae3f46d">get_appname</a> )(struct stp_image *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 returns the name of the application.  <a href="#c8184c887110641206044785fae3f46d"></a><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__t.html#75a8a76ab6d78ba767b21e5ed95827a7">conclude</a> )(struct stp_image *image)</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">This callback is called at the end of each page.  <a href="#75a8a76ab6d78ba767b21e5ed95827a7"></a><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__t.html#e5ba3d09714043232aef970d245182ee">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="#b18e6ee35037589bf485213022e2d871"></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="#e5ba3d09714043232aef970d245182ee"></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. 
-<p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="ce69bf25344a814cabea38afa4527086"></a><!-- doxytag: member="stp_image::init" ref="ce69bf25344a814cabea38afa4527086" args=")(struct stp_image *image)" -->
+It provides callbacks to functions defined within the client application which are called while printing the image. <hr><h2>Field Documentation</h2>
+<a class="anchor" name="96e9c2c9f040fbc66abab45a4b2a79b0"></a><!-- doxytag: member="stp_image_t::init" ref="96e9c2c9f040fbc66abab45a4b2a79b0" args=")(struct stp_image *image)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname">void(* <a class="el" href="structstp__image__t.html#96e9c2c9f040fbc66abab45a4b2a79b0">stp_image_t::init</a>)(struct stp_image *image)          </td>
         </tr>
       </table>
 </div>
@@ -85,12 +83,12 @@ It will be called once per image. <dl compact><dt><b>Parameters:</b></dt><dd>
 
 </div>
 </div><p>
-<a class="anchor" name="7bb2244368c6b1e07d27afb3dd249ffd"></a><!-- doxytag: member="stp_image::reset" ref="7bb2244368c6b1e07d27afb3dd249ffd" args=")(struct stp_image *image)" -->
+<a class="anchor" name="ce331fd802c9c7c65a6538c03aecc0b3"></a><!-- doxytag: member="stp_image_t::reset" ref="ce331fd802c9c7c65a6538c03aecc0b3" args=")(struct stp_image *image)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname">void(* <a class="el" href="structstp__image__t.html#ce331fd802c9c7c65a6538c03aecc0b3">stp_image_t::reset</a>)(struct stp_image *image)          </td>
         </tr>
       </table>
 </div>
@@ -99,7 +97,7 @@ It will be called once per image. <dl compact><dt><b>Parameters:</b></dt><dd>
 <p>
 This callback is called to reset the image to the beginning. 
 <p>
-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>
+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__t.html#ce331fd802c9c7c65a6538c03aecc0b3" 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>
@@ -108,12 +106,12 @@ It may (in principle) be called multiple times if a page is being printed more t
 
 </div>
 </div><p>
-<a class="anchor" name="890033525988e15f4f4a0b4132e5f19b"></a><!-- doxytag: member="stp_image::width" ref="890033525988e15f4f4a0b4132e5f19b" args=")(struct stp_image *image)" -->
+<a class="anchor" name="e120f940a46eeb9d8f6a28b03cea88c0"></a><!-- doxytag: member="stp_image_t::width" ref="e120f940a46eeb9d8f6a28b03cea88c0" args=")(struct stp_image *image)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname">int(* <a class="el" href="structstp__image__t.html#e120f940a46eeb9d8f6a28b03cea88c0">stp_image_t::width</a>)(struct stp_image *image)          </td>
         </tr>
       </table>
 </div>
@@ -130,12 +128,12 @@ This callback returns the width of the image in pixels.
 
 </div>
 </div><p>
-<a class="anchor" name="4977ad211581999a3f3290983929cce9"></a><!-- doxytag: member="stp_image::height" ref="4977ad211581999a3f3290983929cce9" args=")(struct stp_image *image)" -->
+<a class="anchor" name="687ae4bce9980985adfce7a15af38cde"></a><!-- doxytag: member="stp_image_t::height" ref="687ae4bce9980985adfce7a15af38cde" args=")(struct stp_image *image)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname">int(* <a class="el" href="structstp__image__t.html#687ae4bce9980985adfce7a15af38cde">stp_image_t::height</a>)(struct stp_image *image)          </td>
         </tr>
       </table>
 </div>
@@ -152,12 +150,12 @@ This callback returns the height of the image in pixels.
 
 </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)" -->
+<a class="anchor" name="d490679a2b158fcec555d54d7e9bc528"></a><!-- doxytag: member="stp_image_t::get_row" ref="d490679a2b158fcec555d54d7e9bc528" 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="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>
+          <td class="memname"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>(* <a class="el" href="structstp__image__t.html#d490679a2b158fcec555d54d7e9bc528">stp_image_t::get_row</a>)(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)          </td>
         </tr>
       </table>
 </div>
@@ -166,10 +164,10 @@ This callback returns the height of the image in pixels.
 <p>
 This callback transfers the data from the image to the gimp-print library. 
 <p>
-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>
+It is called from the driver layer. It should copy WIDTH (as returned by the <a class="el" href="structstp__image__t.html#e120f940a46eeb9d8f6a28b03cea88c0" 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>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>data</em>&nbsp;</td><td>a pointer to <a class="el" href="structstp__image__t.html#e120f940a46eeb9d8f6a28b03cea88c0" 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>
@@ -177,12 +175,12 @@ It is called from the driver layer. It should copy WIDTH (as returned by the <a
 
 </div>
 </div><p>
-<a class="anchor" name="56636ad7c0dbf0a82284241f796d95cd"></a><!-- doxytag: member="stp_image::get_appname" ref="56636ad7c0dbf0a82284241f796d95cd" args=")(struct stp_image *image)" -->
+<a class="anchor" name="c8184c887110641206044785fae3f46d"></a><!-- doxytag: member="stp_image_t::get_appname" ref="c8184c887110641206044785fae3f46d" args=")(struct stp_image *image)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname">const char*(* <a class="el" href="structstp__image__t.html#c8184c887110641206044785fae3f46d">stp_image_t::get_appname</a>)(struct stp_image *image)          </td>
         </tr>
       </table>
 </div>
@@ -194,12 +192,12 @@ This callback returns the name of the application.
 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)" -->
+<a class="anchor" name="75a8a76ab6d78ba767b21e5ed95827a7"></a><!-- doxytag: member="stp_image_t::conclude" ref="75a8a76ab6d78ba767b21e5ed95827a7" args=")(struct stp_image *image)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname">void(* <a class="el" href="structstp__image__t.html#75a8a76ab6d78ba767b21e5ed95827a7">stp_image_t::conclude</a>)(struct stp_image *image)          </td>
         </tr>
       </table>
 </div>
@@ -211,12 +209,12 @@ This callback is called at the end of each page.
 
 </div>
 </div><p>
-<a class="anchor" name="b18e6ee35037589bf485213022e2d871"></a><!-- doxytag: member="stp_image::rep" ref="b18e6ee35037589bf485213022e2d871" args="" -->
+<a class="anchor" name="e5ba3d09714043232aef970d245182ee"></a><!-- doxytag: member="stp_image_t::rep" ref="e5ba3d09714043232aef970d245182ee" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* <a class="el" href="structstp__image.html#b18e6ee35037589bf485213022e2d871">stp_image::rep</a>          </td>
+          <td class="memname">void* <a class="el" href="structstp__image__t.html#e5ba3d09714043232aef970d245182ee">stp_image_t::rep</a>          </td>
         </tr>
       </table>
 </div>
@@ -230,8 +228,8 @@ A pointer to an application-specific state information that might need to be ass
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </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 f5011d8..5946bcc 100644
--- a/doc/gutenprint/html/structstp__int__bound__t.html
+++ b/doc/gutenprint/html/structstp__int__bound__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -40,8 +40,6 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 int_bound (range) parameter. 
 <p>
-
-<p>
 <hr><h2>Field Documentation</h2>
 <a class="anchor" name="c5ae98fad865ad6d4816016e233f5a53"></a><!-- doxytag: member="stp_int_bound_t::lower" ref="c5ae98fad865ad6d4816016e233f5a53" args="" -->
 <div class="memitem">
@@ -75,8 +73,8 @@ Upper bound.
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineactive__t.html b/doc/gutenprint/html/structstp__lineactive__t.html
index 62a7c61..e508854 100644
--- a/doc/gutenprint/html/structstp__lineactive__t.html
+++ b/doc/gutenprint/html/structstp__lineactive__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -64,8 +64,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebounds__t.html b/doc/gutenprint/html/structstp__linebounds__t.html
index d1f85ac..677b8be 100644
--- a/doc/gutenprint/html/structstp__linebounds__t.html
+++ b/doc/gutenprint/html/structstp__linebounds__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -81,8 +81,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebufs__t.html b/doc/gutenprint/html/structstp__linebufs__t.html
index a426dd8..6c1105c 100644
--- a/doc/gutenprint/html/structstp__linebufs__t.html
+++ b/doc/gutenprint/html/structstp__linebufs__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -64,8 +64,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linecount__t.html b/doc/gutenprint/html/structstp__linecount__t.html
index 25c5600..fd3ad2f 100644
--- a/doc/gutenprint/html/structstp__linecount__t.html
+++ b/doc/gutenprint/html/structstp__linecount__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -64,8 +64,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineoff__t.html b/doc/gutenprint/html/structstp__lineoff__t.html
index 972fb81..8754520 100644
--- a/doc/gutenprint/html/structstp__lineoff__t.html
+++ b/doc/gutenprint/html/structstp__lineoff__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -64,8 +64,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module.html b/doc/gutenprint/html/structstp__module__t.html
index 5f1819e..f1f2bef 100644
--- a/doc/gutenprint/html/structstp__module.html
+++ b/doc/gutenprint/html/structstp__module__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_module Struct Reference</title>
+<title>libgutenprint API Reference: stp_module_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,35 +21,35 @@
     <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>
+<h1>stp_module_t Struct Reference</h1><!-- doxytag: class="stp_module_t" --><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#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__t.html#87a2ab51de6f6860ac0803c0d8114bd7">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#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__t.html#b5ec864c9d2932872dd2ba62c53ba813">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#b60ac536d9ec7b3a306cddf4c06e18bb">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__t.html#66daab38c5658cdffd0ebd3c68e3b326">comment</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"><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__t.html#1bd300254cbc047d2c00688cd7777aa3">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#1a96aa2db220972e124717cc6dd03c8e">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__t.html#f1b13d76a5b44839e773b7ddaf7e73c5">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#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__t.html#12d502ea2386865bc05fd659bebb974f">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#e04ff0565f8ebd56b383917b602ffc4a">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__t.html#2b0e0c7ba523ac34f6a085a3eaaa33f4">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#0e7297a93920d8f6849718d0a32fa2ba">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__t.html#a9ecb04bec44f6348ccb9c86c1330405">syms</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="32e2db7046f281afd6748afe111aee76"></a><!-- doxytag: member="stp_module::name" ref="32e2db7046f281afd6748afe111aee76" args="" -->
+<a class="anchor" name="87a2ab51de6f6860ac0803c0d8114bd7"></a><!-- doxytag: member="stp_module_t::name" ref="87a2ab51de6f6860ac0803c0d8114bd7" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__module.html#32e2db7046f281afd6748afe111aee76">stp_module::name</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__module__t.html#87a2ab51de6f6860ac0803c0d8114bd7">stp_module_t::name</a>          </td>
         </tr>
       </table>
 </div>
@@ -59,12 +59,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="e2038239913d3ddbece919082501c8d0"></a><!-- doxytag: member="stp_module::version" ref="e2038239913d3ddbece919082501c8d0" args="" -->
+<a class="anchor" name="b5ec864c9d2932872dd2ba62c53ba813"></a><!-- doxytag: member="stp_module_t::version" ref="b5ec864c9d2932872dd2ba62c53ba813" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__module.html#e2038239913d3ddbece919082501c8d0">stp_module::version</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__module__t.html#b5ec864c9d2932872dd2ba62c53ba813">stp_module_t::version</a>          </td>
         </tr>
       </table>
 </div>
@@ -74,12 +74,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="b60ac536d9ec7b3a306cddf4c06e18bb"></a><!-- doxytag: member="stp_module::comment" ref="b60ac536d9ec7b3a306cddf4c06e18bb" args="" -->
+<a class="anchor" name="66daab38c5658cdffd0ebd3c68e3b326"></a><!-- doxytag: member="stp_module_t::comment" ref="66daab38c5658cdffd0ebd3c68e3b326" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module::comment</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__module__t.html#66daab38c5658cdffd0ebd3c68e3b326">stp_module_t::comment</a>          </td>
         </tr>
       </table>
 </div>
@@ -89,12 +89,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="4ebc727be1ec8edaaa1b25415a3932e3"></a><!-- doxytag: member="stp_module::class" ref="4ebc727be1ec8edaaa1b25415a3932e3" args="" -->
+<a class="anchor" name="1bd300254cbc047d2c00688cd7777aa3"></a><!-- doxytag: member="stp_module_t::class" ref="1bd300254cbc047d2c00688cd7777aa3" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname"><a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> <a class="el" href="structstp__module__t.html#1bd300254cbc047d2c00688cd7777aa3">stp_module_t::class</a>          </td>
         </tr>
       </table>
 </div>
@@ -104,12 +104,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="1a96aa2db220972e124717cc6dd03c8e"></a><!-- doxytag: member="stp_module::handle" ref="1a96aa2db220972e124717cc6dd03c8e" args="" -->
+<a class="anchor" name="f1b13d76a5b44839e773b7ddaf7e73c5"></a><!-- doxytag: member="stp_module_t::handle" ref="f1b13d76a5b44839e773b7ddaf7e73c5" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* <a class="el" href="structstp__module.html#1a96aa2db220972e124717cc6dd03c8e">stp_module::handle</a>          </td>
+          <td class="memname">void* <a class="el" href="structstp__module__t.html#f1b13d76a5b44839e773b7ddaf7e73c5">stp_module_t::handle</a>          </td>
         </tr>
       </table>
 </div>
@@ -119,12 +119,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="fa7d4259940b8d42a36f14108f504944"></a><!-- doxytag: member="stp_module::init" ref="fa7d4259940b8d42a36f14108f504944" args=")(void)" -->
+<a class="anchor" name="12d502ea2386865bc05fd659bebb974f"></a><!-- doxytag: member="stp_module_t::init" ref="12d502ea2386865bc05fd659bebb974f" args=")(void)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__module.html#fa7d4259940b8d42a36f14108f504944">stp_module::init</a>)(void)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__module__t.html#12d502ea2386865bc05fd659bebb974f">stp_module_t::init</a>)(void)          </td>
         </tr>
       </table>
 </div>
@@ -134,12 +134,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="e04ff0565f8ebd56b383917b602ffc4a"></a><!-- doxytag: member="stp_module::fini" ref="e04ff0565f8ebd56b383917b602ffc4a" args=")(void)" -->
+<a class="anchor" name="2b0e0c7ba523ac34f6a085a3eaaa33f4"></a><!-- doxytag: member="stp_module_t::fini" ref="2b0e0c7ba523ac34f6a085a3eaaa33f4" args=")(void)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__module.html#e04ff0565f8ebd56b383917b602ffc4a">stp_module::fini</a>)(void)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__module__t.html#2b0e0c7ba523ac34f6a085a3eaaa33f4">stp_module_t::fini</a>)(void)          </td>
         </tr>
       </table>
 </div>
@@ -149,12 +149,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="0e7297a93920d8f6849718d0a32fa2ba"></a><!-- doxytag: member="stp_module::syms" ref="0e7297a93920d8f6849718d0a32fa2ba" args="" -->
+<a class="anchor" name="a9ecb04bec44f6348ccb9c86c1330405"></a><!-- doxytag: member="stp_module_t::syms" ref="a9ecb04bec44f6348ccb9c86c1330405" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* <a class="el" href="structstp__module.html#0e7297a93920d8f6849718d0a32fa2ba">stp_module::syms</a>          </td>
+          <td class="memname">void* <a class="el" href="structstp__module__t.html#a9ecb04bec44f6348ccb9c86c1330405">stp_module_t::syms</a>          </td>
         </tr>
       </table>
 </div>
@@ -166,8 +166,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module__version.html b/doc/gutenprint/html/structstp__module__version__t.html
index c92e532..1f22265 100644
--- a/doc/gutenprint/html/structstp__module__version.html
+++ b/doc/gutenprint/html/structstp__module__version__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_module_version Struct Reference</title>
+<title>libgutenprint API Reference: stp_module_version_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,23 +21,23 @@
     <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>
+<h1>stp_module_version_t Struct Reference</h1><!-- doxytag: class="stp_module_version_t" --><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#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__t.html#3395d816d8cb9603ae00220ba74b0d94">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#eced49a93c5e461fa95f809ad077fced">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__t.html#616356e2cc969782c10a138dfa06af42">minor</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="15add43e03d0e1624f40c083fa958692"></a><!-- doxytag: member="stp_module_version::major" ref="15add43e03d0e1624f40c083fa958692" args="" -->
+<a class="anchor" name="3395d816d8cb9603ae00220ba74b0d94"></a><!-- doxytag: member="stp_module_version_t::major" ref="3395d816d8cb9603ae00220ba74b0d94" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__module__version.html#15add43e03d0e1624f40c083fa958692">stp_module_version::major</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__module__version__t.html#3395d816d8cb9603ae00220ba74b0d94">stp_module_version_t::major</a>          </td>
         </tr>
       </table>
 </div>
@@ -47,12 +47,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="eced49a93c5e461fa95f809ad077fced"></a><!-- doxytag: member="stp_module_version::minor" ref="eced49a93c5e461fa95f809ad077fced" args="" -->
+<a class="anchor" name="616356e2cc969782c10a138dfa06af42"></a><!-- doxytag: member="stp_module_version_t::minor" ref="616356e2cc969782c10a138dfa06af42" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__module__version.html#eced49a93c5e461fa95f809ad077fced">stp_module_version::minor</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__module__version__t.html#616356e2cc969782c10a138dfa06af42">stp_module_version_t::minor</a>          </td>
         </tr>
       </table>
 </div>
@@ -64,8 +64,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__attr__s.html b/doc/gutenprint/html/structstp__mxml__attr__t.html
index cb586e2..ebb0d06 100644
--- a/doc/gutenprint/html/structstp__mxml__attr__s.html
+++ b/doc/gutenprint/html/structstp__mxml__attr__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_mxml_attr_s Struct Reference</title>
+<title>libgutenprint API Reference: stp_mxml_attr_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,23 +21,23 @@
     <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>
+<h1>stp_mxml_attr_t Struct Reference</h1><!-- doxytag: class="stp_mxml_attr_t" --><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#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__t.html#37d8a0891b88e9bbc89f873dfb097682">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#25554324bd8ccf8e9558e4705eda0daa">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__t.html#9a5667da7d27fa347051fe5f80aeca0e">value</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="4ea32ac1f797cf7722bf3e8638b21dee"></a><!-- doxytag: member="stp_mxml_attr_s::name" ref="4ea32ac1f797cf7722bf3e8638b21dee" args="" -->
+<a class="anchor" name="37d8a0891b88e9bbc89f873dfb097682"></a><!-- doxytag: member="stp_mxml_attr_t::name" ref="37d8a0891b88e9bbc89f873dfb097682" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstp__mxml__attr__s.html#4ea32ac1f797cf7722bf3e8638b21dee">stp_mxml_attr_s::name</a>          </td>
+          <td class="memname">char* <a class="el" href="structstp__mxml__attr__t.html#37d8a0891b88e9bbc89f873dfb097682">stp_mxml_attr_t::name</a>          </td>
         </tr>
       </table>
 </div>
@@ -47,12 +47,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="25554324bd8ccf8e9558e4705eda0daa"></a><!-- doxytag: member="stp_mxml_attr_s::value" ref="25554324bd8ccf8e9558e4705eda0daa" args="" -->
+<a class="anchor" name="9a5667da7d27fa347051fe5f80aeca0e"></a><!-- doxytag: member="stp_mxml_attr_t::value" ref="9a5667da7d27fa347051fe5f80aeca0e" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstp__mxml__attr__s.html#25554324bd8ccf8e9558e4705eda0daa">stp_mxml_attr_s::value</a>          </td>
+          <td class="memname">char* <a class="el" href="structstp__mxml__attr__t.html#9a5667da7d27fa347051fe5f80aeca0e">stp_mxml_attr_t::value</a>          </td>
         </tr>
       </table>
 </div>
@@ -64,8 +64,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__value__s.html b/doc/gutenprint/html/structstp__mxml__element__t.html
index 233a8d8..007edbe 100644
--- a/doc/gutenprint/html/structstp__mxml__value__s.html
+++ b/doc/gutenprint/html/structstp__mxml__element__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_mxml_value_s Struct Reference</title>
+<title>libgutenprint API Reference: stp_mxml_element_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,25 +21,25 @@
     <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>
+<h1>stp_mxml_element_t Struct Reference</h1><!-- doxytag: class="stp_mxml_element_t" --><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#959d5315fd98119aa5d23d2b8d307c58">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__element__t.html#e678ef57706b8b2a5676612e4d5849c4">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#f29b9bbc769c278dad18ff2cb098ef6a">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__element__t.html#d016326e925b78b7c6b951f33500184a">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#69974b612f59fd3ef1d5db85db2d1a07">attrs</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__attr__t.html">stp_mxml_attr_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__element__t.html#347605ee2ec9846e6d9f56a1b80a5901">attrs</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="959d5315fd98119aa5d23d2b8d307c58"></a><!-- doxytag: member="stp_mxml_value_s::name" ref="959d5315fd98119aa5d23d2b8d307c58" args="" -->
+<a class="anchor" name="e678ef57706b8b2a5676612e4d5849c4"></a><!-- doxytag: member="stp_mxml_element_t::name" ref="e678ef57706b8b2a5676612e4d5849c4" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstp__mxml__value__s.html#959d5315fd98119aa5d23d2b8d307c58">stp_mxml_value_s::name</a>          </td>
+          <td class="memname">char* <a class="el" href="structstp__mxml__element__t.html#e678ef57706b8b2a5676612e4d5849c4">stp_mxml_element_t::name</a>          </td>
         </tr>
       </table>
 </div>
@@ -49,12 +49,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="f29b9bbc769c278dad18ff2cb098ef6a"></a><!-- doxytag: member="stp_mxml_value_s::num_attrs" ref="f29b9bbc769c278dad18ff2cb098ef6a" args="" -->
+<a class="anchor" name="d016326e925b78b7c6b951f33500184a"></a><!-- doxytag: member="stp_mxml_element_t::num_attrs" ref="d016326e925b78b7c6b951f33500184a" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__mxml__value__s.html#f29b9bbc769c278dad18ff2cb098ef6a">stp_mxml_value_s::num_attrs</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__mxml__element__t.html#d016326e925b78b7c6b951f33500184a">stp_mxml_element_t::num_attrs</a>          </td>
         </tr>
       </table>
 </div>
@@ -64,12 +64,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="69974b612f59fd3ef1d5db85db2d1a07"></a><!-- doxytag: member="stp_mxml_value_s::attrs" ref="69974b612f59fd3ef1d5db85db2d1a07" args="" -->
+<a class="anchor" name="347605ee2ec9846e6d9f56a1b80a5901"></a><!-- doxytag: member="stp_mxml_element_t::attrs" ref="347605ee2ec9846e6d9f56a1b80a5901" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname"><a class="el" href="structstp__mxml__attr__t.html">stp_mxml_attr_t</a>* <a class="el" href="structstp__mxml__element__t.html#347605ee2ec9846e6d9f56a1b80a5901">stp_mxml_element_t::attrs</a>          </td>
         </tr>
       </table>
 </div>
@@ -81,8 +81,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </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 909a54a..41a7074 100644
--- a/doc/gutenprint/html/structstp__mxml__node__s.html
+++ b/doc/gutenprint/html/structstp__mxml__node__s.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -38,7 +38,7 @@
 
 <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#ad44d6b2fe0842de0bbf1312035372cd">value</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="unionstp__mxml__value__t.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>
@@ -137,7 +137,7 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname"><a class="el" href="unionstp__mxml__value__t.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>
 </div>
@@ -149,8 +149,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__text__s.html b/doc/gutenprint/html/structstp__mxml__text__t.html
index cf9e192..19b0aee 100644
--- a/doc/gutenprint/html/structstp__mxml__text__s.html
+++ b/doc/gutenprint/html/structstp__mxml__text__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_mxml_text_s Struct Reference</title>
+<title>libgutenprint API Reference: stp_mxml_text_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,23 +21,23 @@
     <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>
+<h1>stp_mxml_text_t Struct Reference</h1><!-- doxytag: class="stp_mxml_text_t" --><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#76bcfbb8c3de4e1c597468d51ef47184">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__t.html#10493f8ced34febc9dafc554df0a9db8">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#ef1865e8cab7d5ab175c6e67f122be15">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__t.html#82078f046e2331d07df9de1a6d526885">string</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="76bcfbb8c3de4e1c597468d51ef47184"></a><!-- doxytag: member="stp_mxml_text_s::whitespace" ref="76bcfbb8c3de4e1c597468d51ef47184" args="" -->
+<a class="anchor" name="10493f8ced34febc9dafc554df0a9db8"></a><!-- doxytag: member="stp_mxml_text_t::whitespace" ref="10493f8ced34febc9dafc554df0a9db8" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__mxml__text__s.html#76bcfbb8c3de4e1c597468d51ef47184">stp_mxml_text_s::whitespace</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__mxml__text__t.html#10493f8ced34febc9dafc554df0a9db8">stp_mxml_text_t::whitespace</a>          </td>
         </tr>
       </table>
 </div>
@@ -47,12 +47,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="ef1865e8cab7d5ab175c6e67f122be15"></a><!-- doxytag: member="stp_mxml_text_s::string" ref="ef1865e8cab7d5ab175c6e67f122be15" args="" -->
+<a class="anchor" name="82078f046e2331d07df9de1a6d526885"></a><!-- doxytag: member="stp_mxml_text_t::string" ref="82078f046e2331d07df9de1a6d526885" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstp__mxml__text__s.html#ef1865e8cab7d5ab175c6e67f122be15">stp_mxml_text_s::string</a>          </td>
+          <td class="memname">char* <a class="el" href="structstp__mxml__text__t.html#82078f046e2331d07df9de1a6d526885">stp_mxml_text_t::string</a>          </td>
         </tr>
       </table>
 </div>
@@ -64,8 +64,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__papersize__t.html b/doc/gutenprint/html/structstp__papersize__t.html
index 9c6c493..f0b053b 100644
--- a/doc/gutenprint/html/structstp__papersize__t.html
+++ b/doc/gutenprint/html/structstp__papersize__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -66,8 +66,6 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The papersize data type. 
 <p>
-
-<p>
 <hr><h2>Field Documentation</h2>
 <a class="anchor" name="660431e579bf100782f7164b45597982"></a><!-- doxytag: member="stp_papersize_t::name" ref="660431e579bf100782f7164b45597982" args="" -->
 <div class="memitem">
@@ -241,8 +239,8 @@ Units of measurement.
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </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 ab76de7..fd47b17 100644
--- a/doc/gutenprint/html/structstp__param__string__t.html
+++ b/doc/gutenprint/html/structstp__param__string__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -37,9 +37,7 @@
 <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. 
-<p>
-<hr><h2>Field Documentation</h2>
+Representation of a choice list of strings. The choices themselves consist of a key and a human-readable name. The list object is opaque. <hr><h2>Field Documentation</h2>
 <a class="anchor" name="c4ccea0dded827b9acdb2d22aa25857b"></a><!-- doxytag: member="stp_param_string_t::name" ref="c4ccea0dded827b9acdb2d22aa25857b" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -72,8 +70,8 @@ Human-readable (translated) text.
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__parameter__t.html b/doc/gutenprint/html/structstp__parameter__t.html
index 51baa17..dd7553f 100644
--- a/doc/gutenprint/html/structstp__parameter__t.html
+++ b/doc/gutenprint/html/structstp__parameter__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -94,8 +94,6 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Parameter description. 
 <p>
-
-<p>
 <hr><h2>Field Documentation</h2>
 <a class="anchor" name="092430e582e7560fb532f546f78ca70c"></a><!-- doxytag: member="stp_parameter_t::name" ref="092430e582e7560fb532f546f78ca70c" args="" -->
 <div class="memitem">
@@ -504,8 +502,8 @@ Default value of the parameter.
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__pass__t.html b/doc/gutenprint/html/structstp__pass__t.html
index 22677e1..baa7912 100644
--- a/doc/gutenprint/html/structstp__pass__t.html
+++ b/doc/gutenprint/html/structstp__pass__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -132,8 +132,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__printfuncs__t.html b/doc/gutenprint/html/structstp__printfuncs__t.html
index 50eb073..72ff1b4 100644
--- a/doc/gutenprint/html/structstp__printfuncs__t.html
+++ b/doc/gutenprint/html/structstp__printfuncs__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -41,7 +41,7 @@
 
 <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#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">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__t.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#18e0da9638360173e0d75d839ce72b92">describe_resolution</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td></tr>
 
@@ -49,9 +49,11 @@
 
 <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#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#5c99986ad02cbcc4dce313bc7f5293fc">start_job</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.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>
+<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__t.html">stp_image_t</a> *image)</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="structstp__printfuncs__t.html#1aee9299429a813e60c7c131ccf93c74">get_external_options</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
@@ -150,7 +152,7 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <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__t.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
 </div>
@@ -210,7 +212,7 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <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__t.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
 </div>
@@ -225,7 +227,22 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <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__t.html">stp_image_t</a> *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="1aee9299429a813e60c7c131ccf93c74"></a><!-- doxytag: member="stp_printfuncs_t::get_external_options" ref="1aee9299429a813e60c7c131ccf93c74" args=")(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>*(* <a class="el" href="structstp__printfuncs__t.html#1aee9299429a813e60c7c131ccf93c74">stp_printfuncs_t::get_external_options</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)          </td>
         </tr>
       </table>
 </div>
@@ -237,8 +254,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__raw__t.html b/doc/gutenprint/html/structstp__raw__t.html
index 18267a1..ea2db71 100644
--- a/doc/gutenprint/html/structstp__raw__t.html
+++ b/doc/gutenprint/html/structstp__raw__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -40,8 +40,6 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Raw parameter. 
 <p>
-
-<p>
 <hr><h2>Field Documentation</h2>
 <a class="anchor" name="5e4620104d47e7e593d75d1ebc977407"></a><!-- doxytag: member="stp_raw_t::bytes" ref="5e4620104d47e7e593d75d1ebc977407" args="" -->
 <div class="memitem">
@@ -75,8 +73,8 @@ Raw data.
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__shade.html b/doc/gutenprint/html/structstp__shade__t.html
index 3cc7180..65ac4c1 100644
--- a/doc/gutenprint/html/structstp__shade.html
+++ b/doc/gutenprint/html/structstp__shade__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_shade Struct Reference</title>
+<title>libgutenprint API Reference: stp_shade_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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,25 +21,25 @@
     <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>
+<h1>stp_shade_t Struct Reference</h1><!-- doxytag: class="stp_shade_t" --><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#07a72426c7bcbf22f1cc253a97a453d4">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__t.html#d43f8713d01af090ecb910a8b5538125">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#8e68774d99e3eecb76f06f7704f1eb90">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__t.html#06cdc2392609bb5e0fd731b02ad7dc1b">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#5057a856d4a6f7095af66b8cefc3cdc3">dot_sizes</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__dotsize__t.html">stp_dotsize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade__t.html#7ab08079ac4667939bfebfc1454101e8">dot_sizes</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="07a72426c7bcbf22f1cc253a97a453d4"></a><!-- doxytag: member="stp_shade::value" ref="07a72426c7bcbf22f1cc253a97a453d4" args="" -->
+<a class="anchor" name="d43f8713d01af090ecb910a8b5538125"></a><!-- doxytag: member="stp_shade_t::value" ref="d43f8713d01af090ecb910a8b5538125" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">double <a class="el" href="structstp__shade.html#07a72426c7bcbf22f1cc253a97a453d4">stp_shade::value</a>          </td>
+          <td class="memname">double <a class="el" href="structstp__shade__t.html#d43f8713d01af090ecb910a8b5538125">stp_shade_t::value</a>          </td>
         </tr>
       </table>
 </div>
@@ -49,12 +49,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="8e68774d99e3eecb76f06f7704f1eb90"></a><!-- doxytag: member="stp_shade::numsizes" ref="8e68774d99e3eecb76f06f7704f1eb90" args="" -->
+<a class="anchor" name="06cdc2392609bb5e0fd731b02ad7dc1b"></a><!-- doxytag: member="stp_shade_t::numsizes" ref="06cdc2392609bb5e0fd731b02ad7dc1b" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__shade.html#8e68774d99e3eecb76f06f7704f1eb90">stp_shade::numsizes</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__shade__t.html#06cdc2392609bb5e0fd731b02ad7dc1b">stp_shade_t::numsizes</a>          </td>
         </tr>
       </table>
 </div>
@@ -64,12 +64,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="5057a856d4a6f7095af66b8cefc3cdc3"></a><!-- doxytag: member="stp_shade::dot_sizes" ref="5057a856d4a6f7095af66b8cefc3cdc3" args="" -->
+<a class="anchor" name="7ab08079ac4667939bfebfc1454101e8"></a><!-- doxytag: member="stp_shade_t::dot_sizes" ref="7ab08079ac4667939bfebfc1454101e8" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname">const <a class="el" href="structstp__dotsize__t.html">stp_dotsize_t</a>* <a class="el" href="structstp__shade__t.html#7ab08079ac4667939bfebfc1454101e8">stp_shade_t::dot_sizes</a>          </td>
         </tr>
       </table>
 </div>
@@ -81,8 +81,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__weave__t.html b/doc/gutenprint/html/structstp__weave__t.html
index 1b4d2cc..73f7966 100644
--- a/doc/gutenprint/html/structstp__weave__t.html
+++ b/doc/gutenprint/html/structstp__weave__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -149,8 +149,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/unionstp__mxml__value__u.html b/doc/gutenprint/html/unionstp__mxml__value__t.html
index e6ed343..b4d25d4 100644
--- a/doc/gutenprint/html/unionstp__mxml__value__u.html
+++ b/doc/gutenprint/html/unionstp__mxml__value__t.html
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_mxml_value_u Union Reference</title>
+<title>libgutenprint API Reference: stp_mxml_value_t 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.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -21,29 +21,29 @@
     <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>
+<h1>stp_mxml_value_t Union Reference</h1><!-- doxytag: class="stp_mxml_value_t" --><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#d4d8442bb433ac3da208e22ff0eaccf7">element</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__element__t.html">stp_mxml_element_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__t.html#96aab65fff9144bb7ac17e525769af31">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#9540870864c06f2bf901024b7cc9048d">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__t.html#14551523faecca83828853601e399aee">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#ca8f6bf03f29248dee0b8d364454d051">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__t.html#50776acb8e84f99d12434b8db2d77b2e">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#3f253397958ad919a1fc97c42a58bc67">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__t.html#0f60d52af338d4cbdd09b93879e89b1a">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#82c76c9aca350baca3b72723d0a4e99d">text</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__text__t.html">stp_mxml_text_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__t.html#3f462c7b6567252b1b2fe6eaf029e1cf">text</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="d4d8442bb433ac3da208e22ff0eaccf7"></a><!-- doxytag: member="stp_mxml_value_u::element" ref="d4d8442bb433ac3da208e22ff0eaccf7" args="" -->
+<a class="anchor" name="96aab65fff9144bb7ac17e525769af31"></a><!-- doxytag: member="stp_mxml_value_t::element" ref="96aab65fff9144bb7ac17e525769af31" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname"><a class="el" href="structstp__mxml__element__t.html">stp_mxml_element_t</a> <a class="el" href="unionstp__mxml__value__t.html#96aab65fff9144bb7ac17e525769af31">stp_mxml_value_t::element</a>          </td>
         </tr>
       </table>
 </div>
@@ -53,12 +53,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="9540870864c06f2bf901024b7cc9048d"></a><!-- doxytag: member="stp_mxml_value_u::integer" ref="9540870864c06f2bf901024b7cc9048d" args="" -->
+<a class="anchor" name="14551523faecca83828853601e399aee"></a><!-- doxytag: member="stp_mxml_value_t::integer" ref="14551523faecca83828853601e399aee" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="unionstp__mxml__value__u.html#9540870864c06f2bf901024b7cc9048d">stp_mxml_value_u::integer</a>          </td>
+          <td class="memname">int <a class="el" href="unionstp__mxml__value__t.html#14551523faecca83828853601e399aee">stp_mxml_value_t::integer</a>          </td>
         </tr>
       </table>
 </div>
@@ -68,12 +68,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="ca8f6bf03f29248dee0b8d364454d051"></a><!-- doxytag: member="stp_mxml_value_u::opaque" ref="ca8f6bf03f29248dee0b8d364454d051" args="" -->
+<a class="anchor" name="50776acb8e84f99d12434b8db2d77b2e"></a><!-- doxytag: member="stp_mxml_value_t::opaque" ref="50776acb8e84f99d12434b8db2d77b2e" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="unionstp__mxml__value__u.html#ca8f6bf03f29248dee0b8d364454d051">stp_mxml_value_u::opaque</a>          </td>
+          <td class="memname">char* <a class="el" href="unionstp__mxml__value__t.html#50776acb8e84f99d12434b8db2d77b2e">stp_mxml_value_t::opaque</a>          </td>
         </tr>
       </table>
 </div>
@@ -83,12 +83,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="3f253397958ad919a1fc97c42a58bc67"></a><!-- doxytag: member="stp_mxml_value_u::real" ref="3f253397958ad919a1fc97c42a58bc67" args="" -->
+<a class="anchor" name="0f60d52af338d4cbdd09b93879e89b1a"></a><!-- doxytag: member="stp_mxml_value_t::real" ref="0f60d52af338d4cbdd09b93879e89b1a" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">double <a class="el" href="unionstp__mxml__value__u.html#3f253397958ad919a1fc97c42a58bc67">stp_mxml_value_u::real</a>          </td>
+          <td class="memname">double <a class="el" href="unionstp__mxml__value__t.html#0f60d52af338d4cbdd09b93879e89b1a">stp_mxml_value_t::real</a>          </td>
         </tr>
       </table>
 </div>
@@ -98,12 +98,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="82c76c9aca350baca3b72723d0a4e99d"></a><!-- doxytag: member="stp_mxml_value_u::text" ref="82c76c9aca350baca3b72723d0a4e99d" args="" -->
+<a class="anchor" name="3f462c7b6567252b1b2fe6eaf029e1cf"></a><!-- doxytag: member="stp_mxml_value_t::text" ref="3f462c7b6567252b1b2fe6eaf029e1cf" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname"><a class="el" href="structstp__mxml__text__t.html">stp_mxml_text_t</a> <a class="el" href="unionstp__mxml__value__t.html#3f462c7b6567252b1b2fe6eaf029e1cf">stp_mxml_value_t::text</a>          </td>
         </tr>
       </table>
 </div>
@@ -115,8 +115,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/util_8h.html b/doc/gutenprint/html/util_8h.html
index bb5d977..3d1cc52 100644
--- a/doc/gutenprint/html/util_8h.html
+++ b/doc/gutenprint/html/util_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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>
+<h1>include/gutenprint/util.h File Reference</h1><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>
@@ -71,6 +63,8 @@
 
 <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#gb3c2a0be5bea6ef42b720eabde62cd44">STP_DBG_PPD</a>&nbsp;&nbsp;&nbsp;0x200000</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>
@@ -148,9 +142,7 @@
 <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><h2>Define Documentation</h2>
+Utility functions. <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">
@@ -171,8 +163,8 @@ Utility functions.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/vars_8h.html b/doc/gutenprint/html/vars_8h.html
index e06f2e8..0ed7426 100644
--- a/doc/gutenprint/html/vars_8h.html
+++ b/doc/gutenprint/html/vars_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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>
+<h1>include/gutenprint/vars.h File Reference</h1><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>
 <code>#include &lt;<a class="el" href="string-list_8h.html">gutenprint/string-list.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -46,7 +38,7 @@
 <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#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct 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#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>
@@ -55,14 +47,15 @@
 <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#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="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">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#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="mdescLeft">&nbsp;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="group__vars.html#g268c87919653380a22b1f69c78fe6555"></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#g25e6aec21fd8f8a65c4c4086d0f3dec0">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#g7974f89cff4cbb5b225d0c4fbb92e9bb">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#g1ac9aa4c059fbb52307d8522a5f1dc6d">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#g4d45b95baae036143e14adfc0014f562">compdata_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+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#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> { <br>
@@ -183,16 +176,16 @@
 <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#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="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#g268c87919653380a22b1f69c78fe6555">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#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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">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#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="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#g268c87919653380a22b1f69c78fe6555">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#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="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g268c87919653380a22b1f69c78fe6555">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#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>
@@ -471,7 +464,7 @@
 <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#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#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#g25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#g1ac9aa4c059fbb52307d8522a5f1dc6d">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#g151b7d922a3e1e5e9d9f0ea8de6ab70a">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
 
@@ -489,10 +482,8 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Print job functions. 
-<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;
+Print job functions. <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/weave_8h.html b/doc/gutenprint/html/weave_8h.html
index 9da12cb..c9204f2 100644
--- a/doc/gutenprint/html/weave_8h.html
+++ b/doc/gutenprint/html/weave_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,15 +14,7 @@
     <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">
+<h1>include/gutenprint/weave.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html">stp_weave_t</a></td></tr>
@@ -97,9 +89,7 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Softweave functions. 
-<p>
-<hr><h2>Define Documentation</h2>
+Softweave functions. <hr><h2>Define Documentation</h2>
 <a class="anchor" name="6e5fd9b98567e1fd3fde622fd42dec67"></a><!-- doxytag: member="weave.h::STP_MAX_WEAVE" ref="6e5fd9b98567e1fd3fde622fd42dec67" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -660,8 +650,8 @@ Softweave functions.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:38 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/xml_8h.html b/doc/gutenprint/html/xml_8h.html
index f167c6e..7cca6b4 100644
--- a/doc/gutenprint/html/xml_8h.html
+++ b/doc/gutenprint/html/xml_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,22 +14,14 @@
     <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>
+<h1>include/gutenprint/xml.h File Reference</h1><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#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 class="memItemLeft" nowrap align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#fad8ff906c4248935a93794f1b6f8c1a">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#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#9082cdb0bef669a2c1cd463874d56cb3">stp_register_xml_parser</a> (const char *name, <a class="el" href="xml_8h.html#fad8ff906c4248935a93794f1b6f8c1a">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#018dc99b4a78447b2e8cf66fec5a47b8">stp_unregister_xml_parser</a> (const char *name)</td></tr>
 
@@ -73,15 +65,13 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-XML tree functions. 
-<p>
-<hr><h2>Typedef Documentation</h2>
-<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)" -->
+XML tree functions. <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="fad8ff906c4248935a93794f1b6f8c1a"></a><!-- doxytag: member="xml.h::stp_xml_parse_func" ref="fad8ff906c4248935a93794f1b6f8c1a" args=")(stp_mxml_node_t *node, const char *file)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname">typedef int(* <a class="el" href="xml_8h.html#fad8ff906c4248935a93794f1b6f8c1a">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>
 </div>
@@ -145,7 +135,7 @@ XML tree functions.
         <tr>
           <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="paramtype"><a class="el" href="xml_8h.html#fad8ff906c4248935a93794f1b6f8c1a">stp_xml_parse_func</a>&nbsp;</td>
           <td class="paramname"> <em>parse_func</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -530,8 +520,8 @@ XML tree functions.
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/gutenprintui2.tag b/doc/gutenprintui2/gutenprintui2.tag
index baa519e..cf0dd53 100644
--- a/doc/gutenprintui2/gutenprintui2.tag
+++ b/doc/gutenprintui2/gutenprintui2.tag
@@ -49,14 +49,14 @@
       <arglist>(obj)</arglist>
     </member>
     <member kind="typedef">
-      <type>_StpuiCurve</type>
+      <type>struct _StpuiCurve</type>
       <name>StpuiCurve</name>
       <anchorfile>curve_8h.html</anchorfile>
       <anchor>5c0213fede0b7d8a91b66e4679cc899a</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
-      <type>_StpuiCurveClass</type>
+      <type>struct _StpuiCurveClass</type>
       <name>StpuiCurveClass</name>
       <anchorfile>curve_8h.html</anchorfile>
       <anchor>057f1c40a70e84c7a187b423ebe4aada</anchor>
@@ -188,14 +188,14 @@
       <arglist>(obj)</arglist>
     </member>
     <member kind="typedef">
-      <type>_StpuiGammaCurve</type>
+      <type>struct _StpuiGammaCurve</type>
       <name>StpuiGammaCurve</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
       <anchor>16a893a0c5c5908d5db1a36c91590d6c</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
-      <type>_StpuiGammaCurveClass</type>
+      <type>struct _StpuiGammaCurveClass</type>
       <name>StpuiGammaCurveClass</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
       <anchor>ec66cf466c32b2ead30a56c3fb1a3e09</anchor>
@@ -224,20 +224,13 @@
     <includes id="gammacurve_8h" name="gammacurve.h" local="no" imported="no">gutenprintui2/gammacurve.h</includes>
     <includes id="typebuiltins_8h" name="typebuiltins.h" local="no" imported="no">gutenprintui2/typebuiltins.h</includes>
     <class kind="struct">stpui_plist_t</class>
-    <class kind="struct">stpui_image</class>
+    <class kind="struct">stpui_image_t</class>
     <member kind="typedef">
-      <type>stpui_image</type>
-      <name>stpui_image_t</name>
-      <anchorfile>gutenprintui_8h.html</anchorfile>
-      <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>4ab1da499b20816c28d1b26c61652c1d</anchor>
-      <arglist>(void *data, gint *width, gint *height, gint *bpp, gint page)</arglist>
+      <anchor>9b59c94766b4713803ec6e1daaa84e70</anchor>
+      <arglist>)(void *data, gint *width, gint *height, gint *bpp, gint page)</arglist>
     </member>
     <member kind="enumeration">
       <name>orient_t</name>
@@ -949,62 +942,62 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stpui_image</name>
-    <filename>structstpui__image.html</filename>
+    <name>stpui_image_t</name>
+    <filename>structstpui__image__t.html</filename>
     <member kind="variable">
       <type>stp_image_t</type>
       <name>im</name>
-      <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>00862540482f307175e9fbf252751320</anchor>
+      <anchorfile>structstpui__image__t.html</anchorfile>
+      <anchor>38f170e2acf7842eb511adf52a1b9de9</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>transpose</name>
-      <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>5f2a75c7187c6abcf20e15e2aad22549</anchor>
+      <anchorfile>structstpui__image__t.html</anchorfile>
+      <anchor>c6914425cfe9376043dc64b9ade33b40</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>hflip</name>
-      <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>f2733a318654d50214c94fccd9a018b7</anchor>
+      <anchorfile>structstpui__image__t.html</anchorfile>
+      <anchor>0b96d404e3e44afd8272c3534a465740</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>vflip</name>
-      <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>c378339fe87fa21d5f117fc11b3f5b6c</anchor>
+      <anchorfile>structstpui__image__t.html</anchorfile>
+      <anchor>167d1341e9223f16afcc3ce4d52c6e72</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_ccw</name>
-      <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>0a31280def8cd739184192dbe8d34fa8</anchor>
+      <anchorfile>structstpui__image__t.html</anchorfile>
+      <anchor>de9e076c2a520fe59fbbad51453c05a7</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_cw</name>
-      <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>e111082f0f23096d89e024c4fde9c0d6</anchor>
+      <anchorfile>structstpui__image__t.html</anchorfile>
+      <anchor>fb7c04bd61d67e06429fcc88e088774e</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_180</name>
-      <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>aaae08fdabffb3d31ac761dfe0624506</anchor>
+      <anchorfile>structstpui__image__t.html</anchorfile>
+      <anchor>215928f81c63d90d2ede73606cf95fd8</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>crop</name>
-      <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>96e6cc155230793c8aa847e5a7cd7255</anchor>
+      <anchorfile>structstpui__image__t.html</anchorfile>
+      <anchor>77fc83d55bb4367e9698244528cbcbe9</anchor>
       <arglist>)(struct stpui_image *image, int left, int top, int right, int bottom)</arglist>
     </member>
   </compound>
diff --git a/doc/gutenprintui2/html/annotated.html b/doc/gutenprintui2/html/annotated.html
index d535beb..8c7c5b2 100644
--- a/doc/gutenprintui2/html/annotated.html
+++ b/doc/gutenprintui2/html/annotated.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -24,11 +24,11 @@
   <tr><td class="indexkey"><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a></td><td class="indexvalue"></td></tr>
-  <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__image__t.html">stpui_image_t</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="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/classes.html b/doc/gutenprintui2/html/classes.html
index 857ab0c..3c70db9 100644
--- a/doc/gutenprintui2/html/classes.html
+++ b/doc/gutenprintui2/html/classes.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -22,10 +22,10 @@
 <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_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="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__t.html">stpui_image_t</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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/curve_8h.html b/doc/gutenprintui2/html/curve_8h.html
index 6737a96..6ae06e1 100644
--- a/doc/gutenprintui2/html/curve_8h.html
+++ b/doc/gutenprintui2/html/curve_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -12,12 +12,6 @@
     <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">
@@ -41,9 +35,11 @@
 <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#5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+<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#057f1c40a70e84c7a187b423ebe4aada">StpuiCurveClass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+<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#59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a> { <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b741f86dc6dfb50a67dd621a287014de1">STPUI_CURVE_TYPE_LINEAR</a>, 
@@ -478,8 +474,8 @@
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/files.html b/doc/gutenprintui2/html/files.html
index d275bce..72e7ebe 100644
--- a/doc/gutenprintui2/html/files.html
+++ b/doc/gutenprintui2/html/files.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -24,8 +24,8 @@
   <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="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions.html b/doc/gutenprintui2/html/functions.html
index ccf1dd3..76a00d3 100644
--- a/doc/gutenprintui2/html/functions.html
+++ b/doc/gutenprintui2/html/functions.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -57,14 +57,14 @@ Here is a list of all struct and union fields with links to the structures/union
 : <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>
+: <a class="el" href="struct__StpuiGammaCurveClass.html#f471d7067cff6f4f8908c147f4d7c99c">_StpuiGammaCurveClass</a>
+, <a class="el" href="struct__StpuiCurveClass.html#053157829bb7c073427955e16c93c863">_StpuiCurveClass</a>
 <li>_gtk_reserved3
-: <a class="el" href="struct__StpuiGammaCurveClass.html#337220ca7c1966c911dd856d8377c66d">_StpuiGammaCurveClass</a>
-, <a class="el" href="struct__StpuiCurveClass.html#64b1fa1cf35f409932139752569ca1f9">_StpuiCurveClass</a>
+: <a class="el" href="struct__StpuiCurveClass.html#64b1fa1cf35f409932139752569ca1f9">_StpuiCurveClass</a>
+, <a class="el" href="struct__StpuiGammaCurveClass.html#337220ca7c1966c911dd856d8377c66d">_StpuiGammaCurveClass</a>
 <li>_gtk_reserved4
-: <a class="el" href="struct__StpuiCurveClass.html#f1b28ac82d8fa56fbc0a84f17d26d7b0">_StpuiCurveClass</a>
-, <a class="el" href="struct__StpuiGammaCurveClass.html#d6007664d93b51b3f533998dfc836634">_StpuiGammaCurveClass</a>
+: <a class="el" href="struct__StpuiGammaCurveClass.html#d6007664d93b51b3f533998dfc836634">_StpuiGammaCurveClass</a>
+, <a class="el" href="struct__StpuiCurveClass.html#f1b28ac82d8fa56fbc0a84f17d26d7b0">_StpuiCurveClass</a>
 </ul>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>auto_size_roll_feed_paper
@@ -78,7 +78,7 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>command_type
 : <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>
+: <a class="el" href="structstpui__image__t.html#77fc83d55bb4367e9698244528cbcbe9">stpui_image_t</a>
 <li>ctlpoint
 : <a class="el" href="struct__StpuiCurve.html#05e34073df0ce5bf7575b2e7383577a8">_StpuiCurve</a>
 <li>current_standard_command
@@ -114,11 +114,11 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>height
 : <a class="el" href="struct__StpuiCurve.html#c679cbbcaa013aa84ac1e799d7299479">_StpuiCurve</a>
 <li>hflip
-: <a class="el" href="structstpui__image.html#f2733a318654d50214c94fccd9a018b7">stpui_image</a>
+: <a class="el" href="structstpui__image__t.html#0b96d404e3e44afd8272c3534a465740">stpui_image_t</a>
 </ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>im
-: <a class="el" href="structstpui__image.html#00862540482f307175e9fbf252751320">stpui_image</a>
+: <a class="el" href="structstpui__image__t.html#38f170e2acf7842eb511adf52a1b9de9">stpui_image_t</a>
 <li>invalid_mask
 : <a class="el" href="structstpui__plist__t.html#49e854e792c73fee7bebcfb4de9ac78a">stpui_plist_t</a>
 </ul>
@@ -165,11 +165,11 @@ Here is a list of all struct and union fields with links to the structures/union
 </ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>rotate_180
-: <a class="el" href="structstpui__image.html#aaae08fdabffb3d31ac761dfe0624506">stpui_image</a>
+: <a class="el" href="structstpui__image__t.html#215928f81c63d90d2ede73606cf95fd8">stpui_image_t</a>
 <li>rotate_ccw
-: <a class="el" href="structstpui__image.html#0a31280def8cd739184192dbe8d34fa8">stpui_image</a>
+: <a class="el" href="structstpui__image__t.html#de9e076c2a520fe59fbbad51453c05a7">stpui_image_t</a>
 <li>rotate_cw
-: <a class="el" href="structstpui__image.html#e111082f0f23096d89e024c4fde9c0d6">stpui_image</a>
+: <a class="el" href="structstpui__image__t.html#fb7c04bd61d67e06429fcc88e088774e">stpui_image_t</a>
 </ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>scaling
@@ -179,7 +179,7 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>table
 : <a class="el" href="struct__StpuiGammaCurve.html#f4a067c4f9e19c57d080b07aca9252b3">_StpuiGammaCurve</a>
 <li>transpose
-: <a class="el" href="structstpui__image.html#5f2a75c7187c6abcf20e15e2aad22549">stpui_image</a>
+: <a class="el" href="structstpui__image__t.html#c6914425cfe9376043dc64b9ade33b40">stpui_image_t</a>
 </ul>
 <h3><a class="anchor" name="index_u">- u -</a></h3><ul>
 <li>unit
@@ -191,10 +191,10 @@ Here is a list of all struct and union fields with links to the structures/union
 <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>
+: <a class="el" href="structstpui__image__t.html#167d1341e9223f16afcc3ce4d52c6e72">stpui_image_t</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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions_vars.html b/doc/gutenprintui2/html/functions_vars.html
index 98eeb60..1fd1c73 100644
--- a/doc/gutenprintui2/html/functions_vars.html
+++ b/doc/gutenprintui2/html/functions_vars.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -57,14 +57,14 @@
 : <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>
+: <a class="el" href="struct__StpuiGammaCurveClass.html#f471d7067cff6f4f8908c147f4d7c99c">_StpuiGammaCurveClass</a>
+, <a class="el" href="struct__StpuiCurveClass.html#053157829bb7c073427955e16c93c863">_StpuiCurveClass</a>
 <li>_gtk_reserved3
-: <a class="el" href="struct__StpuiGammaCurveClass.html#337220ca7c1966c911dd856d8377c66d">_StpuiGammaCurveClass</a>
-, <a class="el" href="struct__StpuiCurveClass.html#64b1fa1cf35f409932139752569ca1f9">_StpuiCurveClass</a>
+: <a class="el" href="struct__StpuiCurveClass.html#64b1fa1cf35f409932139752569ca1f9">_StpuiCurveClass</a>
+, <a class="el" href="struct__StpuiGammaCurveClass.html#337220ca7c1966c911dd856d8377c66d">_StpuiGammaCurveClass</a>
 <li>_gtk_reserved4
-: <a class="el" href="struct__StpuiCurveClass.html#f1b28ac82d8fa56fbc0a84f17d26d7b0">_StpuiCurveClass</a>
-, <a class="el" href="struct__StpuiGammaCurveClass.html#d6007664d93b51b3f533998dfc836634">_StpuiGammaCurveClass</a>
+: <a class="el" href="struct__StpuiGammaCurveClass.html#d6007664d93b51b3f533998dfc836634">_StpuiGammaCurveClass</a>
+, <a class="el" href="struct__StpuiCurveClass.html#f1b28ac82d8fa56fbc0a84f17d26d7b0">_StpuiCurveClass</a>
 </ul>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>auto_size_roll_feed_paper
@@ -78,7 +78,7 @@
 <li>command_type
 : <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>
+: <a class="el" href="structstpui__image__t.html#77fc83d55bb4367e9698244528cbcbe9">stpui_image_t</a>
 <li>ctlpoint
 : <a class="el" href="struct__StpuiCurve.html#05e34073df0ce5bf7575b2e7383577a8">_StpuiCurve</a>
 <li>current_standard_command
@@ -114,11 +114,11 @@
 <li>height
 : <a class="el" href="struct__StpuiCurve.html#c679cbbcaa013aa84ac1e799d7299479">_StpuiCurve</a>
 <li>hflip
-: <a class="el" href="structstpui__image.html#f2733a318654d50214c94fccd9a018b7">stpui_image</a>
+: <a class="el" href="structstpui__image__t.html#0b96d404e3e44afd8272c3534a465740">stpui_image_t</a>
 </ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>im
-: <a class="el" href="structstpui__image.html#00862540482f307175e9fbf252751320">stpui_image</a>
+: <a class="el" href="structstpui__image__t.html#38f170e2acf7842eb511adf52a1b9de9">stpui_image_t</a>
 <li>invalid_mask
 : <a class="el" href="structstpui__plist__t.html#49e854e792c73fee7bebcfb4de9ac78a">stpui_plist_t</a>
 </ul>
@@ -165,11 +165,11 @@
 </ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>rotate_180
-: <a class="el" href="structstpui__image.html#aaae08fdabffb3d31ac761dfe0624506">stpui_image</a>
+: <a class="el" href="structstpui__image__t.html#215928f81c63d90d2ede73606cf95fd8">stpui_image_t</a>
 <li>rotate_ccw
-: <a class="el" href="structstpui__image.html#0a31280def8cd739184192dbe8d34fa8">stpui_image</a>
+: <a class="el" href="structstpui__image__t.html#de9e076c2a520fe59fbbad51453c05a7">stpui_image_t</a>
 <li>rotate_cw
-: <a class="el" href="structstpui__image.html#e111082f0f23096d89e024c4fde9c0d6">stpui_image</a>
+: <a class="el" href="structstpui__image__t.html#fb7c04bd61d67e06429fcc88e088774e">stpui_image_t</a>
 </ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>scaling
@@ -179,7 +179,7 @@
 <li>table
 : <a class="el" href="struct__StpuiGammaCurve.html#f4a067c4f9e19c57d080b07aca9252b3">_StpuiGammaCurve</a>
 <li>transpose
-: <a class="el" href="structstpui__image.html#5f2a75c7187c6abcf20e15e2aad22549">stpui_image</a>
+: <a class="el" href="structstpui__image__t.html#c6914425cfe9376043dc64b9ade33b40">stpui_image_t</a>
 </ul>
 <h3><a class="anchor" name="index_u">- u -</a></h3><ul>
 <li>unit
@@ -191,10 +191,10 @@
 <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>
+: <a class="el" href="structstpui__image__t.html#167d1341e9223f16afcc3ce4d52c6e72">stpui_image_t</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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gammacurve_8h.html b/doc/gutenprintui2/html/gammacurve_8h.html
index 69bacb5..b64990c 100644
--- a/doc/gutenprintui2/html/gammacurve_8h.html
+++ b/doc/gutenprintui2/html/gammacurve_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -12,12 +12,6 @@
     <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">
@@ -41,9 +35,11 @@
 <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#16a893a0c5c5908d5db1a36c91590d6c">StpuiGammaCurve</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+<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#ec66cf466c32b2ead30a56c3fb1a3e09">StpuiGammaCurveClass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+<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#e52edc31b54a94c1e4e106f1966af6e4">stpui_gamma_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
@@ -239,8 +235,8 @@
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals.html b/doc/gutenprintui2/html/globals.html
index f9498ca..6efd89e 100644
--- a/doc/gutenprintui2/html/globals.html
+++ b/doc/gutenprintui2/html/globals.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -54,7 +54,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 </ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_thumbnail_func_t
-: <a class="el" href="gutenprintui_8h.html#4ab1da499b20816c28d1b26c61652c1d">gutenprintui.h</a>
+: <a class="el" href="gutenprintui_8h.html#9b59c94766b4713803ec6e1daaa84e70">gutenprintui.h</a>
 </ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>ORIENT_AUTO
@@ -137,8 +137,6 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <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
@@ -248,8 +246,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_defs.html b/doc/gutenprintui2/html/globals_defs.html
index 0deeff4..b76e10a 100644
--- a/doc/gutenprintui2/html/globals_defs.html
+++ b/doc/gutenprintui2/html/globals_defs.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -62,8 +62,8 @@
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_enum.html b/doc/gutenprintui2/html/globals_enum.html
index 4f369d1..7bff3dd 100644
--- a/doc/gutenprintui2/html/globals_enum.html
+++ b/doc/gutenprintui2/html/globals_enum.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -38,8 +38,8 @@
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_eval.html b/doc/gutenprintui2/html/globals_eval.html
index c7ff9e7..8ab9bad 100644
--- a/doc/gutenprintui2/html/globals_eval.html
+++ b/doc/gutenprintui2/html/globals_eval.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -54,8 +54,8 @@
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_func.html b/doc/gutenprintui2/html/globals_func.html
index 451c7ab..0f894aa 100644
--- a/doc/gutenprintui2/html/globals_func.html
+++ b/doc/gutenprintui2/html/globals_func.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -175,8 +175,8 @@
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_type.html b/doc/gutenprintui2/html/globals_type.html
index 6f2dad0..e5d96a3 100644
--- a/doc/gutenprintui2/html/globals_type.html
+++ b/doc/gutenprintui2/html/globals_type.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -32,9 +32,7 @@
 <p>
 <ul>
 <li>get_thumbnail_func_t
-: <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>
+: <a class="el" href="gutenprintui_8h.html#9b59c94766b4713803ec6e1daaa84e70">gutenprintui.h</a>
 <li>StpuiCurve
 : <a class="el" href="curve_8h.html#5c0213fede0b7d8a91b66e4679cc899a">curve.h</a>
 <li>StpuiCurveClass
@@ -44,8 +42,8 @@
 <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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gutenprintui_8h.html b/doc/gutenprintui2/html/gutenprintui_8h.html
index ced8f34..2a6d3ad 100644
--- a/doc/gutenprintui2/html/gutenprintui_8h.html
+++ b/doc/gutenprintui2/html/gutenprintui_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -12,12 +12,6 @@
     <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>
@@ -28,12 +22,10 @@
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a></td></tr>
 
-<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 class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image__t.html">stpui_image_t</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#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#4ab1da499b20816c28d1b26c61652c1d">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#9b59c94766b4713803ec6e1daaa84e70">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#c33232f845969eb04b32e1006c8240a0">orient_t</a> { <br>
@@ -146,39 +138,24 @@
 
 <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#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">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#9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a>)</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"><a class="el" href="gutenprintui_8h.html#9b59c94766b4713803ec6e1daaa84e70">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#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#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#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>
+<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__t.html">stpui_image_t</a> *im)</td></tr>
 
 </table>
 <hr><h2>Typedef Documentation</h2>
-<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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="195aac96c77c6de3925cd3d13c6ce2f1"></a><!-- doxytag: member="gutenprintui.h::stpui_image_t" ref="195aac96c77c6de3925cd3d13c6ce2f1" args="" -->
+<a class="anchor" name="9b59c94766b4713803ec6e1daaa84e70"></a><!-- doxytag: member="gutenprintui.h::get_thumbnail_func_t" ref="9b59c94766b4713803ec6e1daaa84e70" args=")(void *data, gint *width, gint *height, gint *bpp, gint page)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <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>
+          <td class="memname">typedef guchar*(* <a class="el" href="gutenprintui_8h.html#9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a>)(void *data, gint *width, gint *height, gint *bpp, gint page)          </td>
         </tr>
       </table>
 </div>
@@ -478,7 +455,7 @@
 <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 class="memname"><a class="el" href="gutenprintui_8h.html#9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a> stpui_get_thumbnail_func           </td>
           <td>(</td>
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
@@ -1166,7 +1143,7 @@
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstpui__image.html">stpui_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstpui__image__t.html">stpui_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>im</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -1496,7 +1473,7 @@
         <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="paramtype"><a class="el" href="gutenprintui_8h.html#9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a>&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -1509,8 +1486,8 @@
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/index.html b/doc/gutenprintui2/html/index.html
index 22719f6..f8a1d03 100644
--- a/doc/gutenprintui2/html/index.html
+++ b/doc/gutenprintui2/html/index.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li class="current"><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -14,8 +14,8 @@
 </div>
 <h1>libgutenprintui2 API Reference Documentation</h1>
 <p>
-<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;
+<h3 align="center">5.0.2 </h3><hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurve.html b/doc/gutenprintui2/html/struct__StpuiCurve.html
index 8812210..be8aa89 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurve.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -283,8 +283,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurveClass.html b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
index 8942d63..7eb8a37 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -130,8 +130,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
index c4741f9..94388b6 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -147,8 +147,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
index f256b1d..6fcc84d 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -113,8 +113,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/structstpui__image.html b/doc/gutenprintui2/html/structstpui__image.html
deleted file mode 100644
index 19202bf..0000000
--- a/doc/gutenprintui2/html/structstpui__image.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<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.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#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#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#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#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#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#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#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#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="00862540482f307175e9fbf252751320"></a><!-- doxytag: member="stpui_image::im" ref="00862540482f307175e9fbf252751320" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">stp_image_t <a class="el" href="structstpui__image.html#00862540482f307175e9fbf252751320">stpui_image::im</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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>
-</div>
-<div class="memdoc">
-
-<p>
-
-</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="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.5.2 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprintui2/html/structstpui__image__t.html b/doc/gutenprintui2/html/structstpui__image__t.html
new file mode 100644
index 0000000..ea6c7c1
--- /dev/null
+++ b/doc/gutenprintui2/html/structstpui__image__t.html
@@ -0,0 +1,171 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprintui2 API Reference: stpui_image_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.5.3 -->
+<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_t Struct Reference</h1><!-- doxytag: class="stpui_image_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">stp_image_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image__t.html#38f170e2acf7842eb511adf52a1b9de9">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__t.html#c6914425cfe9376043dc64b9ade33b40">transpose</a> )(struct stpui_image *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__t.html#0b96d404e3e44afd8272c3534a465740">hflip</a> )(struct stpui_image *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__t.html#167d1341e9223f16afcc3ce4d52c6e72">vflip</a> )(struct stpui_image *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__t.html#de9e076c2a520fe59fbbad51453c05a7">rotate_ccw</a> )(struct stpui_image *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__t.html#fb7c04bd61d67e06429fcc88e088774e">rotate_cw</a> )(struct stpui_image *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__t.html#215928f81c63d90d2ede73606cf95fd8">rotate_180</a> )(struct stpui_image *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__t.html#77fc83d55bb4367e9698244528cbcbe9">crop</a> )(struct stpui_image *image, int left, int top, int right, int bottom)</td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="38f170e2acf7842eb511adf52a1b9de9"></a><!-- doxytag: member="stpui_image_t::im" ref="38f170e2acf7842eb511adf52a1b9de9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">stp_image_t <a class="el" href="structstpui__image__t.html#38f170e2acf7842eb511adf52a1b9de9">stpui_image_t::im</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="c6914425cfe9376043dc64b9ade33b40"></a><!-- doxytag: member="stpui_image_t::transpose" ref="c6914425cfe9376043dc64b9ade33b40" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#c6914425cfe9376043dc64b9ade33b40">stpui_image_t::transpose</a>)(struct stpui_image *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="0b96d404e3e44afd8272c3534a465740"></a><!-- doxytag: member="stpui_image_t::hflip" ref="0b96d404e3e44afd8272c3534a465740" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#0b96d404e3e44afd8272c3534a465740">stpui_image_t::hflip</a>)(struct stpui_image *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="167d1341e9223f16afcc3ce4d52c6e72"></a><!-- doxytag: member="stpui_image_t::vflip" ref="167d1341e9223f16afcc3ce4d52c6e72" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#167d1341e9223f16afcc3ce4d52c6e72">stpui_image_t::vflip</a>)(struct stpui_image *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="de9e076c2a520fe59fbbad51453c05a7"></a><!-- doxytag: member="stpui_image_t::rotate_ccw" ref="de9e076c2a520fe59fbbad51453c05a7" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#de9e076c2a520fe59fbbad51453c05a7">stpui_image_t::rotate_ccw</a>)(struct stpui_image *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="fb7c04bd61d67e06429fcc88e088774e"></a><!-- doxytag: member="stpui_image_t::rotate_cw" ref="fb7c04bd61d67e06429fcc88e088774e" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#fb7c04bd61d67e06429fcc88e088774e">stpui_image_t::rotate_cw</a>)(struct stpui_image *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="215928f81c63d90d2ede73606cf95fd8"></a><!-- doxytag: member="stpui_image_t::rotate_180" ref="215928f81c63d90d2ede73606cf95fd8" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#215928f81c63d90d2ede73606cf95fd8">stpui_image_t::rotate_180</a>)(struct stpui_image *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="77fc83d55bb4367e9698244528cbcbe9"></a><!-- doxytag: member="stpui_image_t::crop" ref="77fc83d55bb4367e9698244528cbcbe9" 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="memname">void(* <a class="el" href="structstpui__image__t.html#77fc83d55bb4367e9698244528cbcbe9">stpui_image_t::crop</a>)(struct stpui_image *image, int left, int top, int right, int bottom)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</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="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.3 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprintui2/html/structstpui__plist__t.html b/doc/gutenprintui2/html/structstpui__plist__t.html
index 80595b9..1c465dd 100644
--- a/doc/gutenprintui2/html/structstpui__plist__t.html
+++ b/doc/gutenprintui2/html/structstpui__plist__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -249,8 +249,8 @@
 </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="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/typebuiltins_8h.html b/doc/gutenprintui2/html/typebuiltins_8h.html
index 9d2fee6..1a46a02 100644
--- a/doc/gutenprintui2/html/typebuiltins_8h.html
+++ b/doc/gutenprintui2/html/typebuiltins_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.2 -->
+<!-- Generated by Doxygen 1.5.3 -->
 <div class="tabs">
   <ul>
     <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
@@ -12,12 +12,6 @@
     <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>
@@ -143,8 +137,8 @@
 
 </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;
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jan 1 21:37:39 2008 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.5.2 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
 </body>
 </html>
diff --git a/include/Makefile.in b/include/Makefile.in
index 750baa6..fe19904 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -18,15 +18,11 @@
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -61,61 +57,26 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -125,8 +86,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -207,14 +166,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -234,9 +190,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -255,27 +210,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -287,6 +241,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -332,8 +287,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = gutenprint gutenprintui gutenprintui2
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 MAINTAINERCLEANFILES = Makefile.in
@@ -376,10 +334,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -411,8 +365,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -513,23 +466,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -543,7 +494,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -551,6 +502,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -591,8 +544,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -606,12 +558,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -630,22 +590,24 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 
 @SET_MAKE@
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index dc8850a..d2a08b8 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -19,15 +19,11 @@
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -79,51 +75,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -133,8 +91,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -215,14 +171,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -242,9 +195,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -263,27 +215,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -295,6 +246,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -340,8 +292,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 noinst_HEADERS = gutenprint-intl.h gutenprint-intl-internal.h
 pkginclude_HEADERS = \
@@ -414,13 +369,9 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-nodist_pkgincludeHEADERS: $(nodist_pkginclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
+	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
 	@list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -437,7 +388,7 @@ uninstall-nodist_pkgincludeHEADERS:
 	done
 install-pkgincludeHEADERS: $(pkginclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
+	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -502,23 +453,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -534,7 +483,7 @@ check: check-am
 all-am: Makefile $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -568,8 +517,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
@@ -584,12 +532,20 @@ info-am:
 install-data-am: install-nodist_pkgincludeHEADERS \
 	install-pkgincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -608,21 +564,25 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-nodist_pkgincludeHEADERS \
+uninstall-am: uninstall-nodist_pkgincludeHEADERS \
 	uninstall-pkgincludeHEADERS
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-nodist_pkgincludeHEADERS \
-	install-pkgincludeHEADERS install-strip installcheck \
+	install-pdf install-pdf-am install-pkgincludeHEADERS \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am \
-	uninstall-nodist_pkgincludeHEADERS uninstall-pkgincludeHEADERS
+	uninstall-am uninstall-nodist_pkgincludeHEADERS \
+	uninstall-pkgincludeHEADERS
 
 
 @SET_MAKE@
diff --git a/include/gutenprint/printers.h b/include/gutenprint/printers.h
index 18019e9..97aae75 100644
--- a/include/gutenprint/printers.h
+++ b/include/gutenprint/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.h,v 1.3 2006/04/17 02:06:18 rlk Exp $"
+ * "$Id: printers.h,v 1.3.8.1 2007/12/15 20:35:35 rlk Exp $"
  *
  *   libgimpprint printer functions.
  *
@@ -33,6 +33,7 @@
 extern "C" {
 #endif
 
+#include <gutenprint/string-list.h>
 #include <gutenprint/list.h>
 #include <gutenprint/vars.h>
 
@@ -184,6 +185,17 @@ extern int stp_start_job(const stp_vars_t *v, stp_image_t *image);
  */
 extern int stp_end_job(const stp_vars_t *v, stp_image_t *image);
 
+/**
+ * Retrieve options that need to be passed to the underlying print
+ * system.
+ * @param v the vars to use.
+ * @returns list of options in a string list ('name' is the name
+ * of the option; 'text' is the value it takes on).  NULL return means
+ * no external options are required.  User must stp_string_list_destroy
+ * the list after use.
+ */
+extern stp_string_list_t *stp_get_external_options(const stp_vars_t *v);
+
 typedef struct
 {
   stp_parameter_list_t (*list_parameters)(const stp_vars_t *v);
@@ -202,6 +214,7 @@ typedef struct
   int   (*verify)(stp_vars_t *v);
   int   (*start_job)(const stp_vars_t *v, stp_image_t *image);
   int   (*end_job)(const stp_vars_t *v, stp_image_t *image);
+  stp_string_list_t *(*get_external_options)(const stp_vars_t *v);
 } stp_printfuncs_t;
 
 typedef struct stp_family
@@ -234,5 +247,5 @@ const char *stp_describe_output(const stp_vars_t *v);
 
 #endif /* GUTENPRINT_PRINTERS_H */
 /*
- * End of "$Id: printers.h,v 1.3 2006/04/17 02:06:18 rlk Exp $".
+ * End of "$Id: printers.h,v 1.3.8.1 2007/12/15 20:35:35 rlk Exp $".
  */
diff --git a/include/gutenprint/util.h b/include/gutenprint/util.h
index a146af4..a3089bb 100644
--- a/include/gutenprint/util.h
+++ b/include/gutenprint/util.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.h,v 1.3.2.1 2007/03/02 12:01:13 rlk Exp $"
+ * "$Id: util.h,v 1.3.2.2 2007/12/15 20:35:35 rlk Exp $"
  *
  *   libgimpprint utility and miscellaneous functions.
  *
@@ -128,6 +128,7 @@ extern void stp_catprintf(char **strp, const char *format, ...)
 #define STP_DBG_OLYMPUS		0x40000
 #define STP_DBG_CURVE		0x80000
 #define STP_DBG_CURVE_ERRORS	0x100000
+#define STP_DBG_PPD		0x200000
 
 extern unsigned long stp_get_debug_level(void);
 extern void stp_dprintf(unsigned long level, const stp_vars_t *v,
@@ -178,5 +179,5 @@ extern const char *stp_get_release_version(void);
 
 #endif /* GUTENPRINT_UTIL_H */
 /*
- * End of "$Id: util.h,v 1.3.2.1 2007/03/02 12:01:13 rlk Exp $".
+ * End of "$Id: util.h,v 1.3.2.2 2007/12/15 20:35:35 rlk Exp $".
  */
diff --git a/include/gutenprintui/Makefile.in b/include/gutenprintui/Makefile.in
index e2e82d1..ed28bd4 100644
--- a/include/gutenprintui/Makefile.in
+++ b/include/gutenprintui/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -19,14 +19,10 @@
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -75,51 +71,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -129,8 +87,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -211,14 +167,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -238,9 +191,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -259,27 +211,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -291,6 +242,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -336,8 +288,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 @BUILD_LIBGUTENPRINTUI_TRUE@pkginclude_HEADERS = \
 @BUILD_LIBGUTENPRINTUI_TRUE@	gutenprintui.h
@@ -381,13 +336,9 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-pkgincludeHEADERS: $(pkginclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
+	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -452,23 +403,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -484,7 +433,7 @@ check: check-am
 all-am: Makefile $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -517,8 +466,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
@@ -532,12 +480,20 @@ info-am:
 
 install-data-am: install-pkgincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -556,19 +512,22 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
+uninstall-am: uninstall-pkgincludeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-pkgincludeHEADERS \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkgincludeHEADERS install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-pkgincludeHEADERS
+	tags uninstall uninstall-am uninstall-pkgincludeHEADERS
 
 
 @SET_MAKE@
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index 6c7412f..772de63 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -19,14 +19,10 @@
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -76,51 +72,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -130,8 +88,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -212,14 +168,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -239,9 +192,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -260,27 +212,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -292,6 +243,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -337,8 +289,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 stpui_public_h_sources = \
 	gutenprintui.h		\
@@ -392,13 +347,9 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-pkgincludeHEADERS: $(pkginclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
+	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -463,23 +414,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -495,7 +444,7 @@ check: check-am
 all-am: Makefile $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -528,8 +477,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
@@ -543,12 +491,20 @@ info-am:
 
 install-data-am: install-pkgincludeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -567,19 +523,22 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
+uninstall-am: uninstall-pkgincludeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-pkgincludeHEADERS \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkgincludeHEADERS install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-pkgincludeHEADERS
+	tags uninstall uninstall-am uninstall-pkgincludeHEADERS
 
 
 @SET_MAKE@
diff --git a/m4/stp_release.m4 b/m4/stp_release.m4
index 561c04a..144e67c 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="17 Jun 2007"
+RELEASE_DATE="01 Jan 2008"
 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 cc384cc..5ed9567 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -18,15 +18,11 @@
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,51 +68,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -126,8 +84,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -208,14 +164,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -235,9 +188,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -256,27 +208,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -288,6 +239,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -333,8 +285,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 
 # Conditional installation of manpages is currently broken in automake...
@@ -407,13 +362,9 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
 	for i in $$l2; do \
@@ -458,7 +409,7 @@ uninstall-man1:
 	done
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
 	for i in $$l2; do \
@@ -509,23 +460,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -541,7 +490,7 @@ check: check-am
 all-am: Makefile $(MANS)
 installdirs:
 	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -575,7 +524,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -589,12 +538,20 @@ info-am:
 
 install-data-am: install-man
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man: install-man1 install-man8
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -613,20 +570,24 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-man
+uninstall-am: uninstall-man
 
 uninstall-man: uninstall-man1 uninstall-man8
 
+.MAKE: install-am install-strip
+
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-man1 \
-	install-man8 install-strip installcheck installcheck-am \
+	install-man8 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-man uninstall-man1 uninstall-man8
+	ps ps-am uninstall uninstall-am uninstall-man uninstall-man1 \
+	uninstall-man8
 
 
 @SET_MAKE@
diff --git a/po/cs.gmo b/po/cs.gmo
index 26720bf..7b2cde3 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 3d6f4a7..6628e35 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: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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:1737
+#: src/main/print-escp2.c:1752
 #, fuzzy
 msgid "Default"
 msgstr "Nastavit implicitní"
@@ -83,16 +83,16 @@ msgstr ""
 msgid "Density"
 msgstr "Hustota:"
 
-#: 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -145,27 +145,27 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmus rozkladu barev"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
 msgid "Page Size"
 msgstr "Velikost"
 
-#: 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -174,286 +174,287 @@ msgstr "Velikost"
 msgid "Basic Printer Setup"
 msgstr "Název tiskárny:"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: 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: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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "Typ média"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "Zdroj média"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, 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
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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:252 src/main/print-escp2.c:238
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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:265 src/main/print-escp2.c:335
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: 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:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Fialová"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: 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:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: 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:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: 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:325 src/main/print-canon.c:326
-#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
+#: src/main/print-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: 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: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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: 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:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Vlastní"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tisknout do souboru?"
 
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Barva"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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
@@ -494,9 +495,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Vytisknout"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Odstíny šedi"
 
@@ -583,7 +584,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:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr ""
 
@@ -651,15 +652,16 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Modrozelená"
 
@@ -668,15 +670,16 @@ msgstr "Modrozelená"
 msgid "Adjust the cyan gamma"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Fialová"
 
@@ -685,15 +688,16 @@ msgstr "Fialová"
 msgid "Adjust the magenta gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Žlutá"
 
@@ -702,10 +706,10 @@ msgstr "Žlutá"
 msgid "Adjust the yellow gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr ""
 
@@ -714,8 +718,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr ""
 
@@ -724,10 +728,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr ""
 
@@ -737,14 +741,16 @@ 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Černá"
 
@@ -753,7 +759,7 @@ msgstr "Černá"
 msgid "Adjust the black gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr ""
 
@@ -768,7 +774,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:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Fialová"
@@ -778,7 +784,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:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Žlutá"
@@ -809,9 +815,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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 msgid "Advanced Output Control"
 msgstr ""
 
@@ -977,383 +983,394 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s není platný parametr typu %s\n"
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Neznámá tiskárna %s\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, 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:761
+#: src/main/printers.c:772
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Velikost obrázku není platná\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, 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:788
+#: src/main/printers.c:799
 #, 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:794
+#: src/main/printers.c:805
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Levý okraj nesmí být méně než nula\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Horní okraj nesmí být méně než nula\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, 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:813
+#: src/main/printers.c:824
 #, 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: 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:228
+#: src/main/print-escp2.c:229
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Rozlišení a kvalita tisku"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 #, fuzzy
 msgid "Ink Set"
 msgstr "Typ inkoustu"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 #, fuzzy
 msgid "Ink change command"
 msgstr "Nerozpoznaný příkaz.\n"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Opakuji proces zarovnávání.\n"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 #, fuzzy
 msgid "Channel Names"
 msgstr "Zrušit"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Modrozelená"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Fialová"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Žlutá"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Blue Map"
 msgstr "Černobíle"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Lesklý potah"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ruční"
 
-#: 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Standardní"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 #, fuzzy
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, 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:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1407,128 +1424,129 @@ msgid "test print"
 msgstr "testovací tisk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 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: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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 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: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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 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: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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 msgid "Five Color Photo Composite"
 msgstr "Pět barev foto kompozitní"
 
-#: 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 msgstr "Lesklý potah"
 
-#: 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Obálky"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "Matný papír"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "Papír pro inkoustové tiskárny"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 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: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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "Fotopapír"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr "Extra lesklý fotopapír"
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý papír ve foto kvalitě"
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Jiný"
 
@@ -1544,56 +1562,56 @@ msgstr "Ruční s přestávkou"
 msgid "Manual without Pause"
 msgstr "Ruční bez přestávky"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 #, fuzzy
 msgid "Glossy"
 msgstr "Lesklý potah"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 #, fuzzy
 msgid "Matte"
 msgstr "Matný papír"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 #, fuzzy
 msgid "Black Balance"
 msgstr "Černobíle"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
@@ -1707,8 +1725,8 @@ msgstr "Barevná a foto cartridge"
 msgid "PPDFile"
 msgstr "Soubor PPD:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 #, fuzzy
 msgid "PPD File"
 msgstr "Soubor PPD?"
@@ -1717,295 +1735,301 @@ msgstr "Soubor PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 msgid "Two Level Grayscale"
 msgstr "Dva úrovně stupňů šedi"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "Dva úrovně stupňů šedi"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr "Šet barev rozšířené kompozitní"
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 msgid "Seven Color Photo"
 msgstr "Sedm barev foto"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr "Sedm barev rozšířené"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Šest barev foto"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sedm barev rozšířené"
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 msgid "Two Color Raw"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Tři barvy kompozitní"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Tři barvy kompozitní"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Čtyři barvy standardní"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Čtyři barvy standardní"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 msgid "Five Color Raw"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Šest barev foto"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Šet barev rozšířené kompozitní"
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Sedm barev foto"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sedm barev rozšířené"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Šest barev foto"
 
-#: 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Šest barev foto"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 #, 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 #, 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 #, 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 #, 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
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 #, fuzzy
 msgid "Light Black"
 msgstr "Černá"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Černá/tmavá žlutá"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý potah"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 #, 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr "Rychlé podávání normálního papíru"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Pohlednice"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matný papír"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Extra lesklý fotopapír"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papír ColorLife"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matný papír"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr "Podávací válec"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 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
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 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
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 #, 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 #, fuzzy
 msgid "Print to CD"
 msgstr "Tisknout do souboru?"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Ruční výběr"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Ruční"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Podavač"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 #, fuzzy
 msgid "Photo Board"
 msgstr "Fotopapír"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr "Přihrádka řezaných listů 1"
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr "Přihrádka řezaných listů 2"
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 msgid "Cut Sheet Autoselect"
 msgstr "Automatický výběr řezaných listů"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr "Ruční výběr"
 
@@ -2912,3557 +2936,3726 @@ msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon BJC-6000"
+msgid "Canon BJC-5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon BJC-6100"
+msgid "Canon BJC-5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon BJC-6200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon BJC-6500"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon BJC-7000"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "Canon BJC-7100"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "Canon BJC-8200"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "Canon S100"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "Canon S200"
+msgid "Canon BJC-8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "Canon S300"
+msgid "Canon BJC-8500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "Canon S400"
+msgid "Canon S100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "Canon S450"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "Canon S500"
+msgid "Canon S300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "Canon S600"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "Canon S630"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "Canon S800"
+msgid "Canon S500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "Canon S4500"
+msgid "Canon S600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "Canon PIXMA iP2000"
+msgid "Canon S630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "Canon PIXMA iP3000"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "Canon PIXMA iP3100"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "Canon PIXMA iP4000"
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "Canon PIXMA iP4100"
+msgid "Canon PIXMA iP3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "Canon PIXMA iP4200"
+msgid "Canon PIXMA iP3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:188
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:217
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:398
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:407
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:412
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:415
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:418
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:504
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+msgid "HP LaserJet 1022"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Název tiskárny:"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+msgid "Sharp AR-M257"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Nastavit tiskárnu"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+msgid "Canon SELPHY-CP-720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:983
+msgid "Canon SELPHY-CP-740"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:985
+msgid "Canon SELPHY ES1"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:986
+msgid "Canon SELPHY ES2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:987
+msgid "Canon SELPHY ES20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:988
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "Palec"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "Nastavit základní jednotku měření na palce"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Nastavit základní jednotku měření na centimetry"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Points"
 msgstr "Vytisknout"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, 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:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Nastavit základní jednotku měření na centimetry"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 #, 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:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "Barevný výstup"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr "Tisknout v odstínech šedi pomocí černého inkoustu"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standardní"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Custom Command"
 msgstr "Příkaz:"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Soubor"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 #, fuzzy
 msgid "Print to a file"
 msgstr "Tisknout do souboru?"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 #, fuzzy
 msgid "Set Default"
 msgstr "Nastavit implicitní"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "Budiž"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Tisk v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "O programu"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6470,7 +6663,7 @@ msgstr ""
 "Vytisknout a\n"
 "uložit nastavení"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6478,15 +6671,15 @@ msgstr ""
 "Uložit\n"
 "nastavení"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Vytisknout"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6510,74 +6703,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:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 msgid "Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Rozměry:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Šířka:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 msgid "Width of the paper that you wish to print to"
 msgstr "Šířka papíru, na který chcete tisknout"
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Výška:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 msgid "Height of the paper that you wish to print to"
 msgstr "Výška papíru, na který chcete tisknout"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 msgid "Automatic Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 #, fuzzy
 msgid "Image Position"
 msgstr "Pozice"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Na výšku"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Na šířku"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "Vzhůru nohama"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Na stranu"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6585,125 +6778,125 @@ msgstr ""
 "Vyberte orientaci: na výšku, na šířku, vzhůru nohama nebo na stranu (na "
 "šířku vzhůru nohama)"
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Orientace:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Levý:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Pravý:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 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:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Horní:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 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:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Spodní:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 #, 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:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 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:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "Vycentrovat:"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontálně"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "Vycentrovat obrázek na papíře horizontálně"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Obojí"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "Vycentrovat obrázek na papíře"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertikálně"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "Vycentrovat obrázek na papíře vertikálně"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Nastavit tiskárnu"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Název tiskárny:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Vyberte model své tiskárny"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Model tiskárny:"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "Vyberte model své tiskárny"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "Soubor PPD:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 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:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Procházet"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 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:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -6712,58 +6905,58 @@ msgstr ""
 "Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
 "tisknout"
 
-#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Název tiskárny:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, 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:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 #, fuzzy
 msgid "File to print to"
 msgstr "testovací tisk"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 #, fuzzy
 msgid "Print To File"
 msgstr "Tisknout do souboru?"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "Název tiskárny:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 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:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "O Gimp-Print "
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Verze Gimp-Print "
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Nastavení tiskárny"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6771,11 +6964,11 @@ msgstr ""
 "Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
 "tisknout"
 
-#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "Nastavit tiskárnu..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6783,11 +6976,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:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "Nová tiskárna..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6795,24 +6988,33 @@ 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:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Nastavit implicitní"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 #, fuzzy
 msgid "Image Size"
 msgstr "Typ obrázku"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Měřítko:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "Nastavte měřítko (velikost) obrázku"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6820,31 +7022,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:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Procenta"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "Upravit tisk na velikost stránky"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr "Upravit tisk na počet bodů na palec"
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "Nastavit šířku tisku"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "Nastavit výšku tisku"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6852,67 +7054,67 @@ msgstr ""
 "Použít původní\n"
 "velikost obrázku"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 msgid "Set the print size to the size of the image"
 msgstr "Nastavit velikost tisku na velikost obrázku"
 
-#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "Úprava barvy tisku"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Nastavit implicitní"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Náhled obrázku"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 #, fuzzy
 msgid "Output"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "Zvolte požadovaný typ výstupu"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "Upravit výstup..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 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:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 #, fuzzy
 msgid "Size Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "Vyberte základní jednotku měření pro tisk"
 
@@ -6945,12 +7147,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 #, fuzzy
 msgid "Printer"
 msgstr "Vytisknout"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Nastavit tiskárnu"
@@ -7000,89 +7202,89 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 #, fuzzy
 msgid "Printer Features"
 msgstr "Název tiskárny:"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 #, fuzzy
 msgid "Common"
 msgstr "Příkaz:"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Extra 1"
 msgstr "Podavač 1"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 2"
 msgstr "Podavač 2"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 3"
 msgstr "Podavač 3"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 4"
 msgstr "Podavač 4"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Czech"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "UTF-8"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -7162,12 +7364,12 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
@@ -7209,7 +7411,7 @@ msgstr ""
 "    -q|--quiet         Potlačit hlavičku.\n"
 "    -m|--model         Určení přesného modelu pro zarovnání hlav.\n"
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
@@ -7290,88 +7492,93 @@ msgstr ""
 "    -q Potlačit hlavičku.\n"
 "    -m Určení přesného modelu pro zarovnání hlav.\n"
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Můžete zadat jen jednu tiskárnu nebo přímé zařízení."
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Můžete zadat jen jeden model tiskárny."
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Neznámý přepínač %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Nemohu otevřít zařízení %s: %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Nemohu odeslat příkaz tiskárně\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Nemohu číst z %s: %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "Stav tiskárny vyžaduje použití přímého zařízení.\n"
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Nemohu otevřít %s pro čtení i zápis: %s\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Neznámý přepínač %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Nemohu zapisovat do %s: %s\n"
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7380,7 +7587,7 @@ msgstr ""
 "\n"
 "Nemohu zapisovat do %s: %s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7391,214 +7598,212 @@ msgstr ""
 "Nemohu detekovat typ tiskárny.\n"
 "Použijte prosím -m pro určení modelu své tiskárny.\n"
 
-#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Sytost:"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "Chyba ve vstupu\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "Chyba ve vstupu\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 msgstr "Barva inkoustu"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "Zbývá procent"
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Získání hladiny inkoustu vyžaduje použití přímého zařízení.\n"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Získání hladiny inkoustu vyžaduje použití přímého zařízení.\n"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Identifikace tiskárny vyžaduje použití přímého zařízení.\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Můžete zadat jen jeden model tiskárny."
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Čistím hlavy...\n"
@@ -7750,7 +7955,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Nemohu odeslat příkaz tiskárně, končím.\n"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr ""
@@ -7776,7 +7981,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7866,9 +8071,9 @@ msgid "Final command was not confirmed.\n"
 msgstr "Poslední příkaz nebyl potvrzen.\n"
 
 #: src/escputil/escputil.c:1908
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7882,12 +8087,12 @@ msgstr ""
 "Pro spuštění procedury zarovnání hlav prosím vložte do své tiskárny\n"
 "list papíru.\n"
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "Pokračujte stisknutím enter > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7897,42 +8102,42 @@ msgstr ""
 "Zkontrolujte prosím výtisk a zvolte nejlepší dvojici čar v každém vzorku.\n"
 "Napište číslo dvojice, '?' pro nápovědu nebo 'r' pro zopakování procedury.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "Průchod #%d"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Vložte prosím nový list papíru.\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Číslo mimo rozsah!\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Nemohu pochopit, co jste napsali!\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Nejlepší dvojice čar by měla mít číslo mezi 1 a %d.\n"
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Pokouším se nastavit zarovnání..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "uspělo.\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7945,7 +8150,7 @@ msgstr ""
 "vzorek %d. Pokud není, měli byste pro získání nejlepší kvality tisku proces\n"
 "zopakovat.\n"
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "Chyba ve vstupu\n"
@@ -8950,6 +9155,3 @@ msgstr "Získání dalšího řádku selhalo na %.0f\n"
 
 #~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n"
 #~ msgstr "Parametr %s mimo rozsah (hodnota %d, min %d, max %d)\n"
-
-#~ msgid "Unknown option %s\n"
-#~ msgstr "Neznámý přepínač %s\n"
diff --git a/po/da.gmo b/po/da.gmo
index 47e6380..e132524 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index abeabbe..27cf1e5 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: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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:1737
+#: src/main/print-escp2.c:1752
 msgid "Default"
 msgstr "Standard"
 
@@ -81,16 +81,16 @@ msgstr "Forud dithered inddata"
 msgid "Density"
 msgstr "Tæthed"
 
-#: 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -150,26 +150,26 @@ msgstr "Farveomsætningsmodul"
 msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 msgid "Page Size"
 msgstr "Papirstø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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -177,271 +177,272 @@ msgstr "Papirstørrelse"
 msgid "Basic Printer Setup"
 msgstr "Basis printerindstillinger"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: 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: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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "Medietype"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "Mediekilde"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr "Cd center størrelse"
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 #, fuzzy
 msgid "CD Hub Size (Custom)"
 msgstr "Cd center størrelse"
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, 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
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 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
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Opløsning"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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:252 src/main/print-escp2.c:238
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr "Blækkanaler"
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr "Avanceret printerfunktionalitet"
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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:265 src/main/print-escp2.c:335
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "Tosidet printning"
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Tumble indstilling"
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: 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:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: 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:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: 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:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: 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:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: 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:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: 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:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: 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:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: 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:325 src/main/print-canon.c:326
-#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
+#: src/main/print-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: 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: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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: 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:333 src/main/print-canon.c:334
-#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
+#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: 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:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 msgid "Light Yellow Transition"
 msgstr "Lys gul overgang"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 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
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (vend)"
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "Cd - 12 cm"
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "Cd - 8 cm"
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Egendefineret"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Farver"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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"
@@ -479,9 +480,9 @@ msgstr "Ingen korrektioner"
 msgid "Pre-Dithered"
 msgstr "Forud dithered"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Gråtone"
 
@@ -561,7 +562,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:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr "Ufiltrerede kanaler"
 
@@ -621,15 +622,16 @@ msgstr "Program gamma"
 msgid "Gamma value assumed by application"
 msgstr "Gammaværdi som formodet af program"
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -637,15 +639,16 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Justér gamma for 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -653,15 +656,16 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Justér gamma for 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Gul"
 
@@ -669,10 +673,10 @@ msgstr "Gul"
 msgid "Adjust the yellow gamma"
 msgstr "Justér gamma for gul"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr "Rød"
 
@@ -680,8 +684,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:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr "Grøn"
 
@@ -689,10 +693,10 @@ msgstr "Grøn"
 msgid "Adjust the green gamma"
 msgstr "Justér gamma for grøn"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr "Blå"
 
@@ -701,14 +705,16 @@ 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Sort"
 
@@ -716,7 +722,7 @@ msgstr "Sort"
 msgid "Adjust the black gamma"
 msgstr "Justér sort gamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr "Cyan balance"
 
@@ -729,7 +735,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:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 msgid "Magenta Balance"
 msgstr "Magenta balance"
 
@@ -737,7 +743,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:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 msgid "Yellow Balance"
 msgstr "Gul balance"
 
@@ -763,9 +769,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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 msgid "Advanced Output Control"
 msgstr "Avanceret udskriftskontrol"
 
@@ -914,77 +920,77 @@ msgstr "Grå bestanddels reduktionskurve"
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditionel Gutenprint farveomsætning"
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Værdi skal angives for %s\n"
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "`%s' er ikke en gyldig %s\n"
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, 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:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, 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:620
+#: src/main/printers.c:631
 #, 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:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "%s nulstilling tilstand skal være %s\n"
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr "ingen nulstilling af tæller"
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr "nulstil tæller"
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Ukendt parametertype %s (%d)\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, 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:761
+#: src/main/printers.c:772
 msgid "Page size is not valid\n"
 msgstr "Arkstørrelse er ikke gyldig\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, 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:788
+#: src/main/printers.c:799
 #, 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:794
+#: src/main/printers.c:805
 msgid "Height must be greater than zero\n"
 msgstr "Højde skal være større end nul\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 msgid "Width must be greater than zero\n"
 msgstr "Bredde skal være større end nul\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -993,7 +999,7 @@ msgstr ""
 "Billedet er for bredt til siden: venstre margin er %d, bredde %d, højre kant "
 "er %d\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:824
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1002,266 +1008,278 @@ msgstr ""
 "Billedet er for langt til siden: top margin er %d, højde %d, bund kant er %"
 "d\n"
 
-#: src/main/print-escp2.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr "Automatisk printningstilstand"
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr "Basis udskriftsjustering"
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr "Automatisk printningstilstand"
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Udskriftskvalitet"
 
-#: src/main/print-escp2.c:228
+#: src/main/print-escp2.c:229
 msgid "Resolution of the print"
 msgstr "Udskriftens opløsning"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr "Forbedret glans"
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr "Tilføj glansforbedring"
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 msgid "Ink Set"
 msgstr "Blæk sæt"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Printretning"
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr "Avanceret udskriftsjustering"
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Printretning (envejs giver højere kvalitet, men er langsommere)"
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr "Med/uden margin"
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr "Print uden margin"
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Udjævningsmetode"
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr "Udjævningsmønster der skal bruges"
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr "Justér punktstørrelse som nødvendigt"
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 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:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 msgid "Output Order"
 msgstr "Udskriftsrækkefølge"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr "Retten-ind gennemløb"
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr "Retten-ind valg"
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 msgid "Ink change command"
 msgstr "Kommando til udskiftning af blækpatron"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr "Skiftende retten-ind gennemløb"
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 msgid "Alternate Alignment Choices"
 msgstr "Skiftende retten-ind valg"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr "Understøtter netværkstilstand"
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+#, fuzzy
+msgid "Supports D4 Packet Mode"
+msgstr "Understøtter netværkstilstand"
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 msgid "Channel Names"
 msgstr "Kanalnavne"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr "Ufiltreret kanal tælling"
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 msgid "Cyan Map"
 msgstr "Diagram for cyan"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 msgid "Adjust the cyan map"
 msgstr "Justér diagram for cyan"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 msgid "Magenta Map"
 msgstr "Diagram for magenta"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 msgid "Adjust the magenta map"
 msgstr "Justér diagram for magenta"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 msgid "Yellow Map"
 msgstr "Diagram for gul"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 msgid "Adjust the yellow map"
 msgstr "Justér diagram for gul"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 msgid "Blue Map"
 msgstr "Diagram for blå"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 msgid "Adjust the blue map"
 msgstr "Justér diagram for blå"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr "Diagram for rød"
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 msgid "Adjust the red map"
 msgstr "Justér diagram for rød"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr "Tæthed for rød"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr "Justér tæthed for rød"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr "Tæthed for blå"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr "Justér tæthed for blå"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 msgid "Gloss Level"
 msgstr "Glansniveau"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 msgid "Adjust the gloss level"
 msgstr "Justér glansniveau"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr "Mørkgul overgang"
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr "Grå overgang"
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Gray Transition"
 msgstr "Lysgrå overgang"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Dark Gray Transition"
 msgstr "Mørkgrå overgang"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 msgid "Mid Gray Transition"
 msgstr "Mellemgrå overgang"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 msgid "Medium Gray Transition"
 msgstr "Middelgrå overgang"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 msgid "Full Manual Control"
 msgstr "Fuld manuel kontrol"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr "Automatisk indstillingskontrol"
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manuel kontrol"
 
-#: 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 msgid "Bidirectional"
 msgstr "Tovejs"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 msgid "Unidirectional"
 msgstr "Envejs"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr "Alternativ udfyldning"
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr "Stigende udfyldning"
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr "Aftagende udfyldning"
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr "Stigende dobbelt"
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr "Vige udenom nærmeste nabo"
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, 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:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print indstillinger ikke kontrolleret, kan ikke printe.\n"
@@ -1315,128 +1333,129 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 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: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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 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: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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 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: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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 msgid "Five Color Photo Composite"
 msgstr "Fem farver foto sammensat"
 
-#: 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 msgstr "Blanke 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Kuverter"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "Mat papir"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "Inkjetpapir"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokvalitets inkjetpapir"
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr "Førsteklasses blankt fotopapir"
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr "Førsteklasses glittet fotopapir"
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokvalitets blankt papir"
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Papir"
 
-#: 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Andet"
 
@@ -1452,50 +1471,50 @@ msgstr "Manuel fødning med pause"
 msgid "Manual without Pause"
 msgstr "Manuel fødning uden pause"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr "Ingen"
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 msgid "Glossy"
 msgstr "Blankt"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr "Tekstur"
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 msgid "Matte"
 msgstr "Mat"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr "Lamineret mønster"
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 msgid "Adjust the cyan balance"
 msgstr "Justér cyanbalance"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 msgid "Adjust the magenta balance"
 msgstr "Justér magentabalance"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 msgid "Adjust the yellow balance"
 msgstr "Justér gulbalance"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 msgid "Black Balance"
 msgstr "Sort balance"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 msgid "Adjust the black balance"
 msgstr "Justér sortbalance"
 
@@ -1607,8 +1626,8 @@ msgstr "Farve + foto patroner"
 msgid "PPDFile"
 msgstr "PPDfil"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 msgid "PPD File"
 msgstr "PPD fil"
 
@@ -1616,264 +1635,270 @@ 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:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 msgid "Two Level Grayscale"
 msgstr "To-niveau gråskala"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 msgid "Three Level Grayscale"
 msgstr "Tre-niveau gråskala"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr "FireTone grå"
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr "Seks farver forbedret sammensat"
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 msgid "Seven Color Photo"
 msgstr "Syv farver foto"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr "Syv farver forbedret"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 msgid "Eight Color Photo"
 msgstr "Otte farver foto"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 msgid "One Color Raw"
 msgstr "En farve ufiltreret"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 msgid "One Color Raw Enhanced Gloss"
 msgstr "En farve ufiltreret forbedret glans"
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 msgid "Two Color Raw"
 msgstr "To farver ufiltreret"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 msgid "Three Color Raw"
 msgstr "Tre farver ufiltreret"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 msgid "Three Color Raw Gloss"
 msgstr "Fire farver ufiltreret, glans "
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 msgid "Four Color Raw"
 msgstr "Fire farver ufiltreret"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 msgid "Four Color Raw Gloss"
 msgstr "Fire farver ufiltreret, glans"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 msgid "Five Color Raw"
 msgstr "Fem farver ufiltreret"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 msgid "Six Color Raw"
 msgstr "Seks farver ufiltreret"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seks farver forbedret glans ufiltreret"
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 msgid "Seven Color Raw"
 msgstr "Syv farver ufiltreret"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Syv farver forbedret glans ufiltreret"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 msgid "Eight Color Raw"
 msgstr "Otte farver ufiltreret"
 
-#: 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr "Epson standard blæk"
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome foto sort"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome mat sort"
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 msgid "Light Black"
 msgstr "Lys sort"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 msgid "Dark Yellow"
 msgstr "Mørk gul"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 msgid "Gloss Optimizer"
 msgstr "Glans forbedrer"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr "Almindeligt papir hurtigindføring"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postkort"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr "Baglys film"
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 msgid "Matte Paper Heavyweight"
 msgstr "Heavyweight mat papir"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium silkemat fotopapir"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 msgid "ColorLife Paper"
 msgstr "ColorLife papir"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 msgid "Archival Matte Paper"
 msgstr "Arkivfast mat papir"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr "Rulle fødning"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 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
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 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
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 msgid "Print to CD"
 msgstr "Udskriv på Cd"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 msgid "Manual Sheet Guide"
 msgstr "Manuel ark guide"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 msgid "Manual Feed (Front)"
 msgstr "Manuel fødning (front)"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 msgid "Rear Tray"
 msgstr "Bagerste bakke"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr "Front bakke"
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 msgid "Photo Board"
 msgstr "Foto plade"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr "Tilskårne ark, bakke 1"
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr "Tilskårne ark, bakke 2"
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 msgid "Cut Sheet Autoselect"
 msgstr "Automatisk valg af bakke"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr "Manuel udvælgelse"
 
@@ -2735,3383 +2760,3562 @@ msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
 #: src/main/xmli18n-tmp.h:164
+#, fuzzy
+msgid "Canon BJC-5100"
+msgstr "Canon BJC-1000"
+
+#: src/main/xmli18n-tmp.h:165
+#, fuzzy
+msgid "Canon BJC-5500"
+msgstr "Canon BJC-6500"
+
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:173
+#, fuzzy
+msgid "Canon BJC-8500"
+msgstr "Canon BJC-6500"
+
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:181
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:182
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:183
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:184
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:189
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Epson Stylus CX3700"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Epson Stylus DX4200"
+
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 #, fuzzy
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 #, fuzzy
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 #, fuzzy
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Epson PM 700C"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Epson PM 780C"
+
+#: src/main/xmli18n-tmp.h:504
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+#, fuzzy
+msgid "HP LaserJet 1022"
+msgstr "HP LaserJet 1012"
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr "Okidata OL400"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr "Okidata OL400e"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr "Okidata OL410e"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr "Okidata OL600e"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr "Okidata OL800"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+#, fuzzy
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-161"
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 #, fuzzy
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+#, fuzzy
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:983
+#, fuzzy
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/main/xmli18n-tmp.h:985
+#, fuzzy
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/main/xmli18n-tmp.h:986
+#, fuzzy
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:987
+#, fuzzy
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:988
 #, fuzzy
 msgid "Sony DPP-EX5"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "Tommer"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "Brug tommer som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Brug centimeter som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Points"
 msgstr "Punkter"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 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:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Brug millimeter som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 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:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "Farveudskrift"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr "Print gråtoner med sort blæk"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Standard Command"
 msgstr "Standard kommando"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr "Brug standarddefineret printerkommando"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Custom Command"
 msgstr "Bruger kommando"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr "Anvend egendefineret printerkommando"
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Fil"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 msgid "Print to a file"
 msgstr "Udskriv til fil"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr "Ret kurve..."
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 msgid "Set Default"
 msgstr "Sæt som standard"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr "Genskab forrige"
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "O.k"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Annullér"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Udskriv v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "Om"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6119,7 +6323,7 @@ msgstr ""
 "    Print og\n"
 "gem opsætning"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6127,15 +6331,15 @@ msgstr ""
 "    Gem\n"
 "opsætning"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Smugkig"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6159,73 +6363,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:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 msgid "Paper Size"
 msgstr "Papirstørrelse"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr "Vis alle papirstørrelser"
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Størrelser:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Bredde:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 msgid "Width of the paper that you wish to print to"
 msgstr "Bredden af det papir der skal udskrives på"
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Højde:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 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:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 msgid "Automatic Paper Size"
 msgstr "Automatisk papirstørrelse"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr "Antal kopier"
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 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:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 msgid "Image Position"
 msgstr "Billedposition"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Portræt"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Tværformat"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "Vendt op/ned"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Tværformat vendt op/ned"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6233,120 +6437,120 @@ msgstr ""
 "Vælg papirretning: portræt, tværformat eller portræt og tværformat vendt op/"
 "ned"
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Venstre:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the image"
 msgstr "Afstand fra venstre side af arket til billedet"
 
-#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Højre:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 msgid "Distance from the right of the paper to the image"
 msgstr "Afstand fra højre papirkant til billedet"
 
-#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Øverst:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to the image"
 msgstr "Afstand fra toppen af arket til billedet"
 
-#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Nederst:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 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:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "Centrér:"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Horizontal"
 msgstr "Vandret"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "Centrér billedet i vandret på papiret"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Begge"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "Centrér billedet på papiret"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Vertical"
 msgstr "Lodret"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "Centrér billedet i lodret på papiret"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Indstil printer"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 msgid "Printer Make:"
 msgstr "Printer mærke:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 msgid "Select the make of your printer"
 msgstr "Vælg dit printermærke"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Printermodel:"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "Vælg din printermodel"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "PPD-fil:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Angiv korrekt PPD filnavn for printeren"
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Bladr igennem"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Vælg korrekt PPD filnavn for printeren"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -6354,52 +6558,52 @@ msgstr ""
 "Vælg navnet på uddatakøen (hverken type eller model af printer) som du "
 "ønsker at printe til"
 
-#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 msgid "Printer Queue:"
 msgstr "Printerkø:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "Enter the correct command to print to your printer. "
 msgstr "Angiv den korrekte kommando til printning på din printer. "
 
-#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr "Angiv hvilken fil du vil skrive til. "
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 msgid "File to print to"
 msgstr "Fil der skal skrives til"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 msgid "Print To File"
 msgstr "Udskriv til fil"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "Definér ny printer"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "Printernavn:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Angiv et navn til denne logiske printer"
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 msgid "About Gutenprint "
 msgstr "Om Gutenprint"
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 msgid "Gutenprint Version "
 msgstr "Gutenprint version"
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Printer indstillinger"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6407,11 +6611,11 @@ msgstr ""
 "Vælg navnet på printeren (hverken type eller model af printer) som du ønsker "
 "at udskrive til"
 
-#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "Opsætning printer..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6419,11 +6623,11 @@ msgstr ""
 "Vælg printermodel, PPD fil og kommando, der skal bruges for at printe til "
 "denne printer"
 
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "Ny printer..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6431,23 +6635,32 @@ 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:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Sæt til standardværdier"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 msgid "Image Size"
 msgstr "Billedstørrelse"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Skalering:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "Angiv skalering (størrelse) af billedet"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr "Skalér med:"
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6455,31 +6668,31 @@ msgstr ""
 "Vælg om skalering måles i procent af valgt sidestørrelse, eller antal af "
 "udskriftspunkter pr. tomme"
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "Skalér udskriften til arkstørrelsen"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr "Skalér udskriften til antal punkter pr. tomme"
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "Angiv bredden af udskriften"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "Angiv højden på udskriften"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6487,64 +6700,64 @@ msgstr ""
 "Brug original\n"
 "billedstørrelse"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 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:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "Udskrifts-farvejustering"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Sæt til standardværdier"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Luk"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Smugkig af billede"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr "Vis udskriftskanaler:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 msgid "Output"
 msgstr "Udskrift"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Udskriftstype:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "Vælg den ønskede udskriftstype"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "Justér udskrift..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 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:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 msgid "Size Units:"
 msgstr "Mål-enhed:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Enheder:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "Vælg basisenhed for målangivelse ved printning"
 
@@ -6577,11 +6790,11 @@ msgstr "Berkeley lpd (/usr/libexec/lpc)"
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 msgid "Printer"
 msgstr "Printer"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 msgid "(Default Printer)"
 msgstr "(Standard printer)"
 
@@ -6629,85 +6842,85 @@ msgstr "Størst mulige værdi for Y"
 msgid "_Gamma value"
 msgstr "_Gamma værdi"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 msgid "Printer Features"
 msgstr "Printer egenskaber"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 msgid "Output Control"
 msgstr "Udskriftskontrol"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 msgid "Common"
 msgstr "Almindelig"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 msgid "Extra 1"
 msgstr "Ekstra 1"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 msgid "Extra 2"
 msgstr "Ekstra 2"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 msgid "Extra 3"
 msgstr "Ekstra 3"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 msgid "Extra 4"
 msgstr "Ekstra 4"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Danish"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "Tosidet printning"
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr "Nej"
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 #, fuzzy
 msgid "Value"
 msgstr "Blå"
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr "Finjustering"
 
@@ -6752,6 +6965,7 @@ msgstr ""
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
 #: src/escputil/escputil.c:119
+#, fuzzy
 msgid ""
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
@@ -6787,12 +7001,12 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
@@ -6843,7 +7057,7 @@ msgstr ""
 "    -p|--patterns      Angiv antallet af sæt af mønstre, ved printerhoved "
 "retten ind.\n"
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -6929,88 +7143,93 @@ msgstr ""
 "    -C Angiv antallet af mønstre, ved printerhoved retten ind.\n"
 "    -p Angiv antallet af sæt af mønstre, ved printerhoved retten ind.\n"
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Du kan kun specificere en printer eller en ufiltreret enhed."
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Du kan kun specificere en printermodel."
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr "Retten-ind valg skal mindst være 1."
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr "Retten-ind gennemløb skal være mindst 1."
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Ukendt indstilling %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr "Brug: %s [Indstillinger] kommando\n"
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr "Tast `%s --help' for yderligere information.\n"
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr "Tast `%s -h' for yderligere information.\n"
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Kan ikke åbne enheden %s: %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Kan ikke printe til printer %s med %s\n"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Er ikke i stand til at sende kommando til printeren\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr "Læsning fra printer overskred tidsgrænsen\n"
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan ikke læse fra %s: %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan ikke åbne %s læse/skrive: %s\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Ukendt indstilling %c\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7019,7 +7238,7 @@ msgstr ""
 "\n"
 "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7030,215 +7249,213 @@ msgstr ""
 "Kan ikke detektere printertype.\n"
 "Brug -m for at specificere din printermodel.\n"
 
-#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr "Status: Fejl\n"
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Status: Selv-printning\n"
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Status: Optaget\n"
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Status: Venter\n"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Status: Ledig\n"
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Status: Sat til pause\n"
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Status; Renser\n"
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "Status: Fabriksindstillet\n"
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Status: Lukker ned\n"
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Status Ukendt (%d)\n"
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Fejl: Fatal fejl\n"
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Fejl: Anden tilslutning valgt\n"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Fejl: Låg åbent\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Fejl: Papir problemer\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Fejl: Blæk slut\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Fejl: Papir slut\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Fejl: Afvent returnering fra afrivningsposition\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Fejl: Dobbeltfødningsfejl\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr "Fejl: Uoprettelig papirskærerfejl\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr "Fejl: Genoprettelig papirskærerproblem\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr "Fejl: CD-skuffe tom\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Fejl: Kortlæsningsfejl\n"
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr "Fejl: Skuffelåg åben\n"
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Fejl: Ukendt (%d)\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Printer dyse selv-test\n"
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Blækniveauer:\n"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 msgstr "Blæk farve"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "Procent tilbage"
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr "Advarsel: Sort blækniveau lavt\n"
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Advarsel: Ukendt (%d)\n"
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr "Job-navn: "
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr "blækniveauer"
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr "status"
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Hentning af %s kræver brug af en ufiltreret enhed.\n"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 "Hentning af udvidede blækinformationer kræver brug af en ufiltreret enhed.\n"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr "Del nummer"
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr "Dato"
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Printeridentifikation forudsætter en ufiltreret enhed.\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Kan ikke identificere printermodel.\n"
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Renser hoveder...\n"
@@ -7404,7 +7621,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Ikke i stand til at sende kommando til printeren, afbryder.\n"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr "Afbryder\n"
@@ -7430,7 +7647,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7516,9 +7733,9 @@ msgid "Final command was not confirmed.\n"
 msgstr "Afsluttende kommando blev ikke bekræftet.\n"
 
 #: src/escputil/escputil.c:1908
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7532,12 +7749,12 @@ msgstr ""
 "Placer et ark papir i printeren, og begynd retten-ind\n"
 "processen af print hovedet.\n"
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "Tryk på enter-tasten for at fortsætte > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7547,42 +7764,42 @@ msgstr ""
 "Undersøg printet, og vælg det bedste liniepar i hvert mønster.\n"
 "Tast et par nummer, '?' for hjælp eller 'r' for at gentage processen.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "Gennemløb #%d"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Indsæt et nyt ark papir.\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Antal uden for givet område!\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Jeg kan ikke tolke hvad du tastede!\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Det bedste liniepar skulle være mellem nummer 1 og %d.\n"
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Prøver at sætte retten-ind..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "lykkedes.\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7596,7 +7813,7 @@ msgstr ""
 "Hvis dette ikke er tilfældet, bør du gentage processen, for at opnå den\n"
 "bedste kvalitet i printning.\n"
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "Fejl i inddata\n"
diff --git a/po/de.gmo b/po/de.gmo
index b8d52f8..29f5e76 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 9c8734d..cb62cce 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimpprint 4.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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"
@@ -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:1737
+#: src/main/print-escp2.c:1752
 #, fuzzy
 msgid "Default"
 msgstr "Zurücksetzen"
@@ -83,16 +83,16 @@ msgstr ""
 msgid "Density"
 msgstr "Empfindlichkeit:"
 
-#: 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -152,27 +152,27 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Raster Algorythmus"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
 msgid "Page Size"
 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -181,286 +181,287 @@ msgstr "Größe"
 msgid "Basic Printer Setup"
 msgstr "Drucker Einstellungen"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: 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 "
 
-#: 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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "Medium Type"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "Medium Quelle"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, 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
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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"
 
-#: 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-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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:265 src/main/print-escp2.c:335
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: 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:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: 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:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: 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:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: 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:325 src/main/print-canon.c:326
-#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
+#: src/main/print-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: 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: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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: 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:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Auto"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Drucke in Datei?"
 
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Farbe"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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
@@ -501,9 +502,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Drucken"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Graustufen"
 
@@ -590,7 +591,7 @@ msgid "Output image type"
 msgstr "Ausgabeart:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr ""
 
@@ -658,15 +659,16 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -675,15 +677,16 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -692,15 +695,16 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Gelb"
 
@@ -709,10 +713,10 @@ msgstr "Gelb"
 msgid "Adjust the yellow gamma"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr ""
 
@@ -721,8 +725,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr ""
 
@@ -731,10 +735,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr ""
 
@@ -744,14 +748,16 @@ 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Schwarz"
 
@@ -760,7 +766,7 @@ msgstr "Schwarz"
 msgid "Adjust the black gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr ""
 
@@ -775,7 +781,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:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -785,7 +791,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:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Stellen sie die Gelb-Balance ein"
@@ -816,9 +822,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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Ausgabeart:"
@@ -985,384 +991,395 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s ist kein erlaubter Parameter von %s\n"
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Unbekannter Drucker %s\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, 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"
 
-#: src/main/printers.c:761
+#: src/main/printers.c:772
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Die Bildgröße stimmt nicht\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, 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:788
+#: src/main/printers.c:799
 #, 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:794
+#: src/main/printers.c:805
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Der linke Rand darf nicht kleiner Null sein\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Der obere Rand darf nicht kleiner Null sein\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, 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:813
+#: src/main/printers.c:824
 #, 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: 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:228
+#: src/main/print-escp2.c:229
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Auflösung und Druckqualität"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 #, fuzzy
 msgid "Ink Set"
 msgstr "Tintentype"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 #, fuzzy
 msgid "Output Order"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 #, fuzzy
 msgid "Ink change command"
 msgstr "Unbekannter Befehl.\n"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Wiederhole die Kopf-Ausrichtung.\n"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 #, fuzzy
 msgid "Channel Names"
 msgstr "Abbruch"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Cyan"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Gelb"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Blue Map"
 msgstr "Schwarz-Weiß"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glossy Film"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ausgabeart:"
 
-#: 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 #, fuzzy
 msgid "Automatic"
 msgstr "Größe"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Drucker unterstützt keine Rohdatenausgabe\n"
 
-#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Ungeprüfte Druckoptionen; drucken nicht möglich.\n"
@@ -1416,128 +1433,129 @@ msgid "test print"
 msgstr "Probeausdruck"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 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: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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 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: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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 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: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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 msgid "Five Color Photo Composite"
 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 msgid "Plain Paper"
 msgstr "Normalpapier"
 
-#: 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 msgstr "Glossy 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Umschlag"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "Mattes Papier"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "Inkjet Papier"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Papier"
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "Foto Papier"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Foto Papier"
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Glanz Foto Papier"
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Papier"
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr "Ilford schweres 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Anderes"
 
@@ -1553,56 +1571,56 @@ msgstr "Handeinzug mit Pause"
 msgid "Manual without Pause"
 msgstr "Handeinzug ohne Pause"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 #, fuzzy
 msgid "Glossy"
 msgstr "Glossy Film"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 #, fuzzy
 msgid "Matte"
 msgstr "Mattes Papier"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 #, fuzzy
 msgid "Black Balance"
 msgstr "Schwarz-Weiß"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Stellen sie die Cyan-Balance ein"
@@ -1716,8 +1734,8 @@ msgstr "Farb + Foto Patronen"
 msgid "PPDFile"
 msgstr "PPD Datei:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD Datei?"
@@ -1726,295 +1744,301 @@ msgstr "PPD Datei?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 msgid "Two Level Grayscale"
 msgstr "zweistufig Grau"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "zweistufig Grau"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr "Aus sechs Farben gemischt "
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 msgid "One Color Raw"
 msgstr "einfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 msgid "Two Color Raw"
 msgstr "zweifarbige Rohausgabe"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 msgid "Four Color Raw"
 msgstr "vierfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "vierfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 msgid "Six Color Raw"
 msgstr "Sechsfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Aus sechs Farben gemischt "
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 msgid "Seven Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Sechsfarbige Rohausgabe"
 
-#: 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 #, 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 #, 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 #, 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 #, fuzzy
 msgid "Light Magenta"
 msgstr "helles Magenta"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 #, fuzzy
 msgid "Light Black"
 msgstr "Schwarz"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gelb"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glossy Film"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 #, 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr "Normalpapier Schnelleinzug"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postkarte"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr "Durchlichtfolie"
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Mattes Papier"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium Glossy Foto Papier"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Normalpapier"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Mattes Papier"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr "Vorschub"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 #, 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 #, fuzzy
 msgid "Print to CD"
 msgstr "Drucke in Datei?"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manuell"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manuell"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Schacht"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 #, fuzzy
 msgid "Photo Board"
 msgstr "Foto Papier"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "autom. Auswahl"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr ""
 
@@ -2919,3378 +2943,3538 @@ msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon BJC-6000"
+msgid "Canon BJC-5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon BJC-6100"
+msgid "Canon BJC-5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon BJC-6200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon BJC-6500"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon BJC-7000"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "Canon BJC-7100"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "Canon BJC-8200"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "Canon S100"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "Canon S200"
+msgid "Canon BJC-8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "Canon S300"
+msgid "Canon BJC-8500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "Canon S400"
+msgid "Canon S100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "Canon S450"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "Canon S500"
+msgid "Canon S300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "Canon S600"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "Canon S630"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "Canon S800"
+msgid "Canon S500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "Canon S4500"
+msgid "Canon S600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "Canon PIXMA iP2000"
+msgid "Canon S630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "Canon PIXMA iP3000"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "Canon PIXMA iP3100"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "Canon PIXMA iP4000"
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "Canon PIXMA iP4100"
+msgid "Canon PIXMA iP3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "Canon PIXMA iP4200"
+msgid "Canon PIXMA iP3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
-msgid "Canon PIXMA iP4300"
+msgid "Canon PIXMA iP4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:188
-msgid "Canon PIXMA iP5000"
+msgid "Canon PIXMA iP4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:189
-msgid "Canon PIXMA iP5200"
+msgid "Canon PIXMA iP4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:190
-msgid "Canon PIXMA iP6700"
+msgid "Canon PIXMA iP4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:192
+msgid "Canon PIXMA iP5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:193
+msgid "Canon PIXMA iP5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:194
+msgid "Canon PIXMA iP5300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:195
+msgid "Canon PIXMA iP6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:197
+msgid "Canon PIXMA iX5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:199
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+msgid "Canon PIXMA MP170"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:201
+msgid "Canon PIXMA MP180"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:202
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:204
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+msgid "Canon PIXMA MP710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:206
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+msgid "Canon PIXMA MP740"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:208
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+msgid "Canon i80"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:217
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C20SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C20UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C40SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C40UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C41"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C41SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C41UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C42SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C42UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C43SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C43UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C44"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C44SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 msgid "Epson Stylus C44UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C46"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C48"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C61"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 msgid "Epson Stylus C62"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C63"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus C64"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus C65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus C66"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus C68"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus C70"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus C80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus C82"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus C83"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus C84"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus C85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus C86"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus C88"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color I"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color IIs"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color PRO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Pro XL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 460"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 480"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 640"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Color 670"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Color 680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Color 740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Color 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Color 777"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Color 800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Color 850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Color 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Color 880"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Color 8 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Color 900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Color 980"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Color 1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Color 1500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Color 1520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Color 3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 msgid "Epson Stylus Photo 830U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 msgid "Epson Stylus Photo 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 msgid "Epson Stylus Photo 1270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo 1280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo 1290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 msgid "Epson Stylus Photo 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 msgid "Epson Stylus Photo 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 msgid "Epson Stylus Photo R200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo R210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo R220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 msgid "Epson Stylus Photo R300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo R310"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo R320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo R340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo RX400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Photo RX420"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Photo RX425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Photo RX430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Photo RX500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Photo RX510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Photo RX600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Photo RX620"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus Photo RX630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus Photo RX700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus Photo R800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus Photo R1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus Photo R2400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus Pro 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus Pro 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus Pro 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus Pro 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus Pro 7600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus Pro 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus Pro 9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus Pro 9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus Pro 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus Scan 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 msgid "Epson Stylus Scan 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 msgid "Epson Stylus CX1500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX3650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 msgid "Epson Stylus CX3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX3805"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX4700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX4800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus CX5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus CX5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus CX5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus CX5400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson Stylus CX5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 msgid "Epson Stylus CX5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 msgid "Epson Stylus CX6300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 msgid "Epson Stylus CX6400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 msgid "Epson Stylus CX6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 msgid "Epson Stylus CX6600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson Stylus CX7700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson Stylus CX7800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson Stylus CX8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson Stylus CX8400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson Stylus D68"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson Stylus D88"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson Stylus DX3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson Stylus DX3850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson Stylus DX4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson Stylus DX4250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson Stylus DX4800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PM 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 msgid "Epson PM D750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 msgid "Epson PM D770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 msgid "Epson PM D1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 msgid "Epson PM G700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 msgid "Epson PM G720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 msgid "Epson PM G800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 msgid "Epson PM G820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 msgid "Epson PX G900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 msgid "Epson PX G920"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 msgid "Epson PX G5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 msgid "Epson PX V500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 msgid "Epson PX V600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:504
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+msgid "HP LaserJet 1022"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Drucker Name:"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+msgid "Sharp AR-M257"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Drucker einrichten"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+msgid "Canon SELPHY-CP-720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:982
+msgid "Canon SELPHY-CP-730"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:983
+msgid "Canon SELPHY-CP-740"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:984
+msgid "Canon SELPHY-CP-750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:985
+msgid "Canon SELPHY ES1"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:986
+msgid "Canon SELPHY ES2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:987
+msgid "Canon SELPHY ES20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:988
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "Zoll"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "Stelle die Basismaßeinheit auf Zoll"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Die Basiseinheit auf Zentimeter einstellen"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Points"
 msgstr "Drucken"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Stelle die Basismaßeinheit auf Zoll"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Die Basiseinheit auf Zentimeter einstellen"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Stelle die Basismaßeinheit auf Zoll"
 
-#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "Farbausgabe"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr "Drucke Graustufen nur mit schwarzer Tinte"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standard"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Custom Command"
 msgstr "Befehl:"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Datei"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 #, fuzzy
 msgid "Print to a file"
 msgstr "Drucke in Datei?"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 #, fuzzy
 msgid "Set Default"
 msgstr "Zurücksetzen"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Drucke v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "Über"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6298,7 +6482,7 @@ msgstr ""
 "Drucke und\n"
 "Sichere die Einstellungen"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6306,15 +6490,15 @@ msgstr ""
 "Sichere\n"
 "die Einstellungen"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Drucken"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6337,76 +6521,76 @@ msgstr ""
 "Das Drücken einer anderen Taste, während des Verschiebens, bringt das Bild "
 "in seine Ausgangsposition zurück."
 
-#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 #, fuzzy
 msgid "Paper Size"
 msgstr "Größe"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Maße:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Breite:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 msgid "Width of the paper that you wish to print to"
 msgstr "Breite des Papiers"
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Höhe:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 msgid "Height of the paper that you wish to print to"
 msgstr "Höhe des Papiers"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Größe"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 #, fuzzy
 msgid "Image Position"
 msgstr "Position"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Aufrecht"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Querformat"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "umgekehrt Aufrecht"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "umgekehrt Querformat"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6414,125 +6598,125 @@ msgstr ""
 "wählen sie die Ausrichtung: Aufrecht, Querformat, umgekehrt Aufrecht, "
 "umgekehrt Querformat"
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Ausrichtung:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "links:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the image"
 msgstr "Entfernung vom linken Blattrand Bildrand"
 
-#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "rechts:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 msgid "Distance from the right of the paper to the image"
 msgstr "Entfernung vom rechten Blattrand zum Bildrand"
 
-#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Oben:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to the image"
 msgstr "Entfernung vom oberen Blattrand zum Bildrand"
 
-#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "unten:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 #, 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:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Entfernung vom unteren Blattrand zum Bild"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "Zentrieren:"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 #, fuzzy
 msgid "Horizontal"
 msgstr "Waagerecht"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "Bild waagerecht auf dem Blatt zentrieren"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Beides"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "Bild auf dem Blatt zentrieren"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 #, fuzzy
 msgid "Vertical"
 msgstr "senkrecht"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "Bild senkrecht auf dem Blatt zentrieren"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Drucker einrichten"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Drucker Name:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Wählen sie ihr Druckermodel"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Druckermodel:"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "Wählen sie ihr Druckermodel"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "PPD Datei:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Suchen"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -6541,58 +6725,58 @@ msgstr ""
 "Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
 "Modell...)"
 
-#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Drucker Name:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
 
-#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 #, fuzzy
 msgid "File to print to"
 msgstr "Probeausdruck"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 #, fuzzy
 msgid "Print To File"
 msgstr "Drucke in Datei?"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "Drucker Name:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Bitte geben sie einen Pseudonym für diesen Drucker an."
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Über Gimp-Print "
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print Version "
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Drucker Einstellungen"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6600,11 +6784,11 @@ msgstr ""
 "Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
 "Modell...)"
 
-#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "Drucker einrichten..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6612,11 +6796,11 @@ msgstr ""
 "Wählen sie ein Druckermodel, eine PPD-Datei und einen Befehl zum Drucken auf "
 "diesem Drucker"
 
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "neuer Drucker..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6624,24 +6808,33 @@ msgstr ""
 "neuer logischer Drucker. Hier können sie einer besonderen Druckereinstellung "
 "einen Namen geben und später unter diesem einfach aufrufen."
 
-#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Zurücksetzen"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 #, fuzzy
 msgid "Image Size"
 msgstr "Größe"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Zoom:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "Einstellung der Bildgröße"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6649,31 +6842,31 @@ msgstr ""
 "Wählen sie ob die Einstellungen in Prozent oder in Punkte per Zoll erfolgen "
 "sollen"
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Prozent"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "Bildgröße an Seitengröße anpassen"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr "Wählen sie die Druckauflösung (Punkte per Zoll)"
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "Einstellen der Breite des Ausdrucks"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "Einstellen der Höhe des Ausdrucks"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6681,68 +6874,68 @@ msgstr ""
 "Benutze originale\n"
 "Bildgröße"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 msgid "Set the print size to the size of the image"
 msgstr "Ausdruckgröße gleich Bildgröße"
 
-#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "Farbabstimmung"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Zurücksetzen"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Schließen"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Vorschau"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 #, fuzzy
 msgid "Output"
 msgstr "Ausgabeart:"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Ausgabeart:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "Wählen sie die gewüschte Ausgabeart:"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "Ausgabeeinstellungen.."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Einstellungen für Farbalance, Helligkeit, Kontrast, Sättigung und Rasterung"
 
-#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 #, fuzzy
 msgid "Size Units:"
 msgstr "Einheiten:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Einheiten:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "Wählen sie die Basismaßeinheit für das Drucken"
 
@@ -6775,12 +6968,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 #, fuzzy
 msgid "Printer"
 msgstr "Drucken"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Drucker einrichten"
@@ -6830,90 +7023,90 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 #, fuzzy
 msgid "Printer Features"
 msgstr "Drucker Einstellungen"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Output Control"
 msgstr "Ausgabeart:"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 #, fuzzy
 msgid "Common"
 msgstr "Befehl:"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Extra 1"
 msgstr "Schacht 1"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 2"
 msgstr "Schacht 2"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 3"
 msgstr "Schacht 3"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 4"
 msgstr "Schacht 4"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "German"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -6994,12 +7187,12 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
@@ -7044,7 +7237,7 @@ msgstr ""
 "    -q|--quiet         Unterdrücke die Programmausgaben.\n"
 "    -m|--model         Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n"
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
@@ -7129,89 +7322,94 @@ msgstr ""
 "    -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
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Sie sollten nur einen Drucker oder eine Schnittstelle angeben."
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Sie sollten nur ein Druckermodell angeben."
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Unbekannte Option %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Kann die Schnittstelle nicht öffnen %s: %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Kann keine Befehle an den Drucker senden\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Kann nicht von %s: %s lesen.\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 "Zur Druckerabfrage  bedarf es des Zugriffs auf die direkte Schnittstelle.\n"
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kann %s nicht lesen/beschreiben: %s\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Unbekannte Option %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kann nicht auf %s: %s schreiben.\n"
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7220,7 +7418,7 @@ msgstr ""
 "\n"
 "Kann auf %s: %s nicht schreiben\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7231,215 +7429,213 @@ msgstr ""
 "Kann den Druckertype nicht feststellen.\n"
 "Bitte nutzen sie die -m Option um das Model mitzuteilen.\n"
 
-#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Farbbalance:"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "Eingabefehler\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "Eingabefehler\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 msgstr "Farbtinte"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "Prozent verbleibend"
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 "Zur Druckererkennung bedarf es des Zugriffs auf die direkte Schnittstelle.\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Sie sollten nur ein Druckermodell angeben."
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Reinige die Köpfe...\n"
@@ -7603,7 +7799,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Kann keinen Befehl an den Drucken senden, beende mich.\n"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr ""
@@ -7629,7 +7825,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7719,9 +7915,9 @@ msgid "Final command was not confirmed.\n"
 msgstr "Der letzte Befehl wurde nicht bestätigt.\n"
 
 #: src/escputil/escputil.c:1908
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7734,12 +7930,12 @@ msgstr ""
 "\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
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "Drücken sie Eingabe um fortzufahren > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7751,42 +7947,42 @@ msgstr ""
 "Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu "
 "wiederholen\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "Durchgang #%d"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Bitte legen sie ein neues Blatt ein.\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Die Zahl ist ungültig!\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Wie bitte ?????\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, 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"
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Beginne die Köpfe einzurichten..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "erledigt. \n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7799,7 +7995,7 @@ msgstr ""
 "mungen jeder Zeile im Muster %d sein. Wenn nicht, sollten sie diesen\n"
 "Vorgang wiederholen.\n"
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "Eingabefehler\n"
@@ -8511,9 +8707,6 @@ msgstr "Zeilensprung gescheitert bei % 0f \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"
 
-#~ msgid "Unknown option %s\n"
-#~ msgstr "Unbekannte Option %s\n"
-
 #~ msgid "13x19"
 #~ msgstr "13×19"
 
diff --git a/po/el.gmo b/po/el.gmo
index f5f8a69..6e908b6 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index e6a684c..bc9a2d1 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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"
@@ -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:1737
+#: src/main/print-escp2.c:1752
 #, fuzzy
 msgid "Default"
 msgstr "Ορισμός Προκαθορισμένων Τιμών"
@@ -86,16 +86,16 @@ msgstr ""
 msgid "Density"
 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -145,27 +145,27 @@ msgid "Dither algorithm"
 msgstr ""
 
 #
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -174,291 +174,292 @@ msgstr "Μέγεθος"
 msgid "Basic Printer Setup"
 msgstr "Ρυθμίσεις Επιλογέα"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Επιλέξτε τον φάκελο που θέλετε να ανοίξετε"
 
-#: 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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 #, fuzzy
 msgid "Media Type"
 msgstr "Είδος MIME"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 #, fuzzy
 msgid "Media Source"
 msgstr "Ανοικτό Λογισμικό"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Ελάττωση του μεγέθους της εικόνας στο μισό"
 
-#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Ανάλυση"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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:252 src/main/print-escp2.c:238
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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 "Αρχείο κειμένου προς συμπερίληψη στην αναφορά"
 
-#: 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-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Όνομα εκτυπωτή:"
 
-#: src/main/print-canon.c:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Κύρια Σελίδα"
 
-#: 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-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Πυκνότητα"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "μώβ"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Πυκνότητα"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Πυκνότητα"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Στο κέντρο της οθόνης"
 
-#: 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-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 #, fuzzy
 msgid "Light Cyan Transition"
 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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Ψιλή Βροχή"
 
-#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ψιλή Βροχή"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
 # Translation of "custom" sucks!  ("kata paraggelia"???  nah!)
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Ορισμένο από το χρήστη"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Εκτύπωση σε Αρχείο"
 
 #
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Χρώμα"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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
@@ -500,9 +501,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Εκτύπωση"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Κλίμακα του γκρι"
 
@@ -591,7 +592,7 @@ msgid "Output image type"
 msgstr "Byte Εξόδου"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr ""
 
@@ -657,15 +658,16 @@ msgstr "Γάμμα"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Κυανό"
 
@@ -674,15 +676,16 @@ msgstr "Κυανό"
 msgid "Adjust the cyan gamma"
 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 #, fuzzy
 msgid "Magenta"
 msgstr "μώβ"
@@ -692,15 +695,16 @@ msgstr "μώβ"
 msgid "Adjust the magenta gamma"
 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Κίτρινο"
 
@@ -709,10 +713,10 @@ msgstr "Κίτρινο"
 msgid "Adjust the yellow gamma"
 msgstr "Στο κέντρο της οθόνης"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr ""
 
@@ -721,8 +725,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr ""
 
@@ -731,10 +735,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Στο κέντρο της οθόνης"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr ""
 
@@ -744,14 +748,16 @@ 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Μαύρο"
 
@@ -760,7 +766,7 @@ msgstr "Μαύρο"
 msgid "Adjust the black gamma"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr ""
 
@@ -775,7 +781,7 @@ msgstr "Κλίμακα του γκρι"
 msgid "Adjust the cyan gray balance"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "μώβ"
@@ -785,7 +791,7 @@ msgstr "μώβ"
 msgid "Adjust the magenta gray balance"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Στο κέντρο της οθόνης"
@@ -814,9 +820,9 @@ 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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Byte Εξόδου"
@@ -985,381 +991,392 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Άγνωστος κωδικός op %u"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:761
+#: src/main/printers.c:772
 msgid "Page size is not valid\n"
 msgstr ""
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:788
+#: src/main/printers.c:799
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:794
+#: src/main/printers.c:805
 msgid "Height must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 msgid "Width must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, 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:813
+#: src/main/printers.c:824
 #, 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr ""
 
-#: src/main/print-escp2.c:228
+#: src/main/print-escp2.c:229
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 #, fuzzy
 msgid "Ink Set"
 msgstr "Τύπος MIME"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 #, fuzzy
 msgid "Output Order"
 msgstr "Byte Εξόδου"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 #, fuzzy
 msgid "Ink change command"
 msgstr "άγνωστο χρώμα: %s"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr ""
 
+#: src/main/print-escp2.c:318
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
 #
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 #, fuzzy
 msgid "Channel Names"
 msgstr "Ακύρωση"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Κυανό"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Magenta Map"
 msgstr "μώβ"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Κίτρινο"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Blue Map"
 msgstr "Μαυ_ρόασπρο"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Πυκνότητα"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Πυκνότητα"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Ψιλή Βροχή"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Ψιλή Βροχή"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Ψιλή Βροχή"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Ψιλή Βροχή"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Byte Εξόδου"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Κανονικό"
 
 #
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 #, fuzzy
 msgid "Automatic"
 msgstr "Μέγεθος"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 #, fuzzy
 msgid "Bidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 #, fuzzy
 msgid "Unidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1414,134 +1431,135 @@ msgid "test print"
 msgstr "Τίτλοι προς εκτύπωση"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: 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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 #, 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 #, 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 #, fuzzy
 msgid "Envelopes"
 msgstr "Προγραμματιστές"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 #, fuzzy
 msgid "Matte Paper"
 msgstr "Χαρτί Μανίλα"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 #, fuzzy
 msgid "Photo Paper"
 msgstr "Κείμενα"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr ""
 
 #
-#: 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Άλλα"
 
@@ -1559,55 +1577,55 @@ msgstr "Σελίδα εγχειριδίου"
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 #, fuzzy
 msgid "Matte"
 msgstr "Χαρτί Μανίλα"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Στο κέντρο της οθόνης"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 #, fuzzy
 msgid "Black Balance"
 msgstr "Μαυ_ρόασπρο"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Στο κέντρο της οθόνης"
@@ -1737,8 +1755,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "Αρχείο Ταυτότητας Διεργασίας: "
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 #, fuzzy
 msgid "PPD File"
 msgstr " Αρχείο "
@@ -1747,304 +1765,310 @@ msgstr " Αρχείο "
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Κλίμακα του γκρι"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "Κλίμακα του γκρι"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 #, fuzzy
 msgid "Seven Color Enhanced"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Stylus Color Pro"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Stylus Color Pro"
 
-#: 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Slashdot"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 #, 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 #, 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 #, 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Ψιλή Βροχή"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 #, fuzzy
 msgid "Light Black"
 msgstr "Μαύρο"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Κίτρινο"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 #, 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 #, fuzzy
 msgid "Plain Paper Fast Load"
 msgstr "Κύρια Σελίδα"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 #, fuzzy
 msgid "Postcard"
 msgstr "Τελευταία καρτέλα"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 #, fuzzy
 msgid "Back Light Film"
 msgstr "Ελαφρύ χαλάζι"
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Χαρτί Μανίλα"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Κύρια Σελίδα"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Χαρτί Μανίλα"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 #, fuzzy
 msgid "Roll Feed"
 msgstr "Ρόλος"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 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
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 #, 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 #, 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
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 #, 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
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Εγχειρίδιο"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Δοκιμή"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 #, fuzzy
 msgid "Photo Board"
 msgstr "Κείμενα"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Απεπιλογή"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr ""
 
@@ -2982,3576 +3006,3745 @@ msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon BJC-6000"
+msgid "Canon BJC-5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon BJC-6100"
+msgid "Canon BJC-5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon BJC-6200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon BJC-6500"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon BJC-7000"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "Canon BJC-7100"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "Canon BJC-8200"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "Canon S100"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "Canon S200"
+msgid "Canon BJC-8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "Canon S300"
+msgid "Canon BJC-8500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "Canon S400"
+msgid "Canon S100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "Canon S450"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "Canon S500"
+msgid "Canon S300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "Canon S600"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "Canon S630"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "Canon S800"
+msgid "Canon S500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "Canon S4500"
+msgid "Canon S600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "Canon PIXMA iP2000"
+msgid "Canon S630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "Canon PIXMA iP3000"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "Canon PIXMA iP3100"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "Canon PIXMA iP4000"
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "Canon PIXMA iP4100"
+msgid "Canon PIXMA iP3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "Canon PIXMA iP4200"
+msgid "Canon PIXMA iP3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:188
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:217
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Slashdot"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:398
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:407
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:412
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:415
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:418
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:504
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
 #
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Επιλογή εκτυπωτή"
 
 #
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Επιλογή εκτυπωτή"
 
 #
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Επιλογή εκτυπωτή"
 
 #
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Επιλογή εκτυπωτή"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+msgid "HP LaserJet 1022"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Όνομα εκτυπωτή:"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+msgid "Sharp AR-M257"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Ρύθμιση Εκτυπωτή"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+msgid "Canon SELPHY-CP-720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:983
+msgid "Canon SELPHY-CP-740"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:985
+msgid "Canon SELPHY ES1"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:986
+msgid "Canon SELPHY ES2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:987
+msgid "Canon SELPHY ES20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:988
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Inch"
 msgstr "ίντσα"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr ""
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Points"
 msgstr "Εκτύπωση"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Επιλέγει γραμματοσειρές για επικόλληση"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Επιλέγει γραμματοσειρές για επικόλληση"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Επιλέγει γραμματοσειρές για επικόλληση"
 
-#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 #, fuzzy
 msgid "Color output"
 msgstr "Κύλιση όταν υπάρχει νέα έξοδος"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Standard Command"
 msgstr "Κανονικό"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Custom Command"
 msgstr "Εντολή:"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr ""
 
 #
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Αρχείο"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 #, fuzzy
 msgid "Print to a file"
 msgstr "Εκτύπωση σε Αρχείο"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 #, fuzzy
 msgid "Set Default"
 msgstr "Ορισμός Προκαθορισμένων Τιμών"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr ""
 
 #
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "Εντάξει"
 
 #
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, fuzzy, c-format
 msgid "%s -- Print v%s"
 msgstr "%s έκδοση %s"
 
 #
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "Περί"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 #, fuzzy
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr "Αποθήκευση Ρυθμίσεων"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 #, fuzzy
 msgid ""
 "Save\n"
@@ -6559,16 +6752,16 @@ msgid ""
 msgstr "Αποθήκευση Ρυθμίσεων"
 
 #
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Εκτύπωση"
 
 #
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Προεπισκόπηση"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6583,59 +6776,59 @@ msgid ""
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 #, fuzzy
 msgid "Paper Size"
 msgstr "Μέγεθος"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Διαστάσεις:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Πλάτος:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 #, fuzzy
 msgid "Width of the paper that you wish to print to"
 msgstr "Επιλέξτε τον φάκελο που θέλετε να ανοίξετε"
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Ύψος:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 #, fuzzy
 msgid "Height of the paper that you wish to print to"
 msgstr "Επιλέξτε τον φάκελο που θέλετε να ανοίξετε"
 
 #
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Μέγεθος"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 #, fuzzy
 msgid "Image Position"
 msgstr "Θέση"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Αυτόματο"
 
@@ -6643,380 +6836,389 @@ msgstr "Αυτόματο"
 # 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:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Πορτραίτο"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Οριζόντιος"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 #, fuzzy
 msgid "Upside down"
 msgstr "Ανάποδα"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Tοπίο"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 #, fuzzy
 msgid "Orientation:"
 msgstr "Προσανατολισμός"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Αριστερά:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Δεξιά:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 #, fuzzy
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Εστίαση για προσαρμογή του ύψους της σελίδας"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 msgid "Distance from the right of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Πάνω:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Κάτω:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Εστίαση για προσαρμογή του ύψους της σελίδας"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 msgid "Distance from the bottom of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 #, fuzzy
 msgid "Center:"
 msgstr "Κέντρο"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 #, fuzzy
 msgid "Horizontal"
 msgstr "_Οριζόντια"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Και τα δύο"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 #, fuzzy
 msgid "Center the image on the paper"
 msgstr "Αλλαγή του μεγέθους σελίδας"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 #, fuzzy
 msgid "Vertical"
 msgstr "Κατακόρυ_φα"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 #, fuzzy
 msgid "Center the image vertically on the paper"
 msgstr "Περιστροφή εικόνας για κάθετα ταμπλώ"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Ρύθμιση Εκτυπωτή"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Όνομα εκτυπωτή:"
 
 #
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Επιλογή εκτυπωτή"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 #, fuzzy
 msgid "Printer Model:"
 msgstr "Όνομα εκτυπωτή:"
 
 #
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 #, fuzzy
 msgid "Select your printer model"
 msgstr "Επιλογή εκτυπωτή"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 #, fuzzy
 msgid "PPD File:"
 msgstr "Αρχείο Ταυτότητας Διεργασίας: "
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Εξερεύνηση"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 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:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Όνομα εκτυπωτή:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "Enter the correct command to print to your printer. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 #, fuzzy
 msgid "File to print to"
 msgstr "Τίτλοι προς εκτύπωση"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 #, fuzzy
 msgid "Print To File"
 msgstr "Εκτύπωση σε Αρχείο"
 
 #
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 #, fuzzy
 msgid "Define New Printer"
 msgstr "Επιλογή εκτυπωτή"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 #, fuzzy
 msgid "Printer Name:"
 msgstr "Όνομα εκτυπωτή:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 #, fuzzy
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Εισάγετε τον αριθμό γραμμής στον οποίο θέλετε να πάτε."
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Σημείο Προσάρτησης: "
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Εκτύπωση σε: "
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 #, fuzzy
 msgid "Printer Settings"
 msgstr "Ρυθμίσεις Επιλογέα"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 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:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 #, fuzzy
 msgid "Setup Printer..."
 msgstr "Ρύθμιση Εκτυπωτή"
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 #, fuzzy
 msgid "New Printer..."
 msgstr "Εκτύπωση..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 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:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Ορισμός Προκαθορισμένων Τιμών"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
 #
-#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 #, fuzzy
 msgid "Image Size"
 msgstr "Μέγεθος"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 #, fuzzy
 msgid "Scaling:"
 msgstr "Αποθήκευση:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 #, fuzzy
 msgid "Set the scale (size) of the image"
 msgstr "Ελάττωση του μεγέθους της εικόνας στο μισό"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Ποσοστό"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 #, fuzzy
 msgid "Scale the print to the size of the page"
 msgstr "Ελάττωση του μεγέθους της εικόνας στο μισό"
 
 #
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 #, fuzzy
 msgid "PPI"
 msgstr "ΑΡΙΘΜ.ΔΙΕΡΓΑΣΙΑΣ"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 #, fuzzy
 msgid "Set the width of the print"
 msgstr "Το πλάτος του μαραφετιού"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 #, fuzzy
 msgid "Set the height of the print"
 msgstr "Εστίαση για προσαρμογή του ύψους της σελίδας"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 #, fuzzy
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr "Αρχικό _Μέγεθος"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 #, fuzzy
 msgid "Set the print size to the size of the image"
 msgstr "Ορισμός παραμετροποιημένου μεγέθους για την εικόνα"
 
-#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 #, fuzzy
 msgid "Print Color Adjust"
 msgstr "Πρωτεύωντα Χρώματα"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 #, fuzzy
 msgid "Set Defaults"
 msgstr "Ορισμός Προκαθορισμένων Τιμών"
 
 #
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 #, fuzzy
 msgid "Image preview"
 msgstr "Παρατηρητής Εικόνων"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 #, fuzzy
 msgid "Output"
 msgstr "Byte Εξόδου"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 #, fuzzy
 msgid "Output Type:"
 msgstr "Byte Εξόδου"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 #, fuzzy
 msgid "Select the desired output type"
 msgstr "Επιλογή αρχείου προς αποθήκευση"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 #, fuzzy
 msgid "Size Units:"
 msgstr "&Μονάδες:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 #, fuzzy
 msgid "Units:"
 msgstr "&Μονάδες:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 #, fuzzy
 msgid "Select the base unit of measurement for printing"
 msgstr "Επιλέγει γραμματοσειρές για επικόλληση"
@@ -7051,12 +7253,12 @@ msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
 #
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 #, fuzzy
 msgid "Printer"
 msgstr "Εκτύπωση"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Ρύθμιση Εκτυπωτή"
@@ -7106,92 +7308,92 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 #, fuzzy
 msgid "Printer Features"
 msgstr "Ρυθμίσεις Επιλογέα"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Output Control"
 msgstr "Byte Εξόδου"
 
 #
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 #, fuzzy
 msgid "Common"
 msgstr "Εντολή:"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Extra 1"
 msgstr "Δοκιμή"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 2"
 msgstr "Δοκιμή"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 3"
 msgstr "Δοκιμή"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 4"
 msgstr "Δοκιμή"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Greek"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 #, fuzzy
 msgid "ISOLatin1"
 msgstr "Λάτιν"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -7255,17 +7457,17 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -7309,95 +7511,100 @@ msgid ""
 "    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, fuzzy, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Μπορείτε να αποθηκεύσετε μια μόνο διεύθυνση τη φορά.\n"
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, fuzzy, c-format
 msgid "You may only specify one printer model."
 msgstr "Μπορείτε να αποθηκεύσετε μια μόνο διεύθυνση τη φορά.\n"
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, fuzzy, c-format
 msgid "Unknown option %c\n"
 msgstr "Άγνωστος κωδικός op %u"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, fuzzy, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Άνοιγμα αρχείου %s αδύνατον\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, fuzzy, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Δεν είναι δυνατό να γίνει καταχώρηση αποθήκευσης με κέλυφος"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, fuzzy, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Ανεπιτυχής σύνδεση στο πιλότο"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, fuzzy, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Δεν είναι δυνατό να ελεγχθεί ο φάκελος: %s: %s"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, fuzzy, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Άνοιγμα αρχείου %s αδύνατον\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Άγνωστος κωδικός op %u"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, fuzzy, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Εγγραφή αδύνατη: %s"
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr "Εγγραφή αδύνατη: %s"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7405,217 +7612,215 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
 #
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Κορεσμός:"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "Σφάλμα προσθήκης λίστας"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "Σφάλμα προσθήκης λίστας"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 #, fuzzy
 msgid "Ink color"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 #, fuzzy
 msgid "Percent remaining"
 msgstr "Επί τοις εκατό ελεύθερο"
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Μπορείτε να αποθηκεύσετε μια μόνο διεύθυνση τη φορά.\n"
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, fuzzy, c-format
 msgid "Cleaning heads...\n"
 msgstr "Ανάγνωση επικεφαλίδων..."
@@ -7705,7 +7910,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr ""
@@ -7724,7 +7929,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7803,7 +8008,7 @@ msgstr ""
 #: src/escputil/escputil.c:1908
 #, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7811,13 +8016,13 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 #, fuzzy
 msgid "Press enter to continue > "
 msgstr "Παρακαλώ εισαγάγετε μια γραμμή εντολών παρακάτω."
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7825,43 +8030,43 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
 #
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, fuzzy, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Παρακαλώ εισάγετε 200 δραχμές για να συνεχίσετε."
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, fuzzy, c-format
 msgid "Number out of range!\n"
 msgstr "Αριθμός Σελίδων"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, fuzzy, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Δεν καταλαβαίνω την εντολή σου. "
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, fuzzy, c-format
 msgid "Attempting to set alignment..."
 msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων"
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7870,7 +8075,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, fuzzy, c-format
 msgid "Error in input\n"
 msgstr "Σφάλμα προσθήκης λίστας"
@@ -8683,10 +8888,6 @@ msgstr ""
 #~ msgid "Yellow:"
 #~ msgstr "Κίτρινο"
 
-#, fuzzy
-#~ msgid "Unknown option %s\n"
-#~ msgstr "Άγνωστος κωδικός op %u"
-
 #~ msgid "1440 x 360 DPI"
 #~ msgstr "1440 x 360 DPI"
 
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index c9d9968..db6c647 100644
--- a/po/en_GB.gmo
+++ b/po/en_GB.gmo
diff --git a/po/en_GB.po b/po/en_GB.po
index ae37bd9..3a10c3e 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: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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:1737
+#: src/main/print-escp2.c:1752
 msgid "Default"
 msgstr "Default"
 
@@ -76,16 +76,16 @@ msgstr "Predithered Input"
 msgid "Density"
 msgstr "Density"
 
-#: 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -145,26 +145,26 @@ msgstr "Colour conversion module"
 msgid "Dither algorithm"
 msgstr "Dither algorithm"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 msgid "Page Size"
 msgstr "Page Size"
 
-#: 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -172,271 +172,272 @@ msgstr "Page Size"
 msgid "Basic Printer Setup"
 msgstr "Basic Printer Setup"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: 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: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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "Media Type"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "Media Source"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr "CD Hub Size"
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 #, fuzzy
 msgid "CD Hub Size (Custom)"
 msgstr "CD Hub Size"
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, 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
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 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
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Resolution"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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:252 src/main/print-escp2.c:238
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr "Ink Channels"
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 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:264 src/main/print-escp2.c:334
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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:265 src/main/print-escp2.c:335
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "Double-Sided Printing"
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Tumble Setting"
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 msgid "Cyan Density"
 msgstr "Cyan Density"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: 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:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 msgid "Magenta Density"
 msgstr "Magenta Density"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: 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:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 msgid "Yellow Density"
 msgstr "Yellow Density"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: 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:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 msgid "Black Density"
 msgstr "Black Density"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: 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:325 src/main/print-canon.c:326
-#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
+#: src/main/print-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: 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: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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: 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:333 src/main/print-canon.c:334
-#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
+#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: 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:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 msgid "Light Yellow Transition"
 msgstr "Light Yellow Transition"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 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
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr "Short Edge (Flip)"
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "CD - 5 inch"
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "CD - 3 inch"
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Custom"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Colour"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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"
@@ -474,9 +475,9 @@ msgstr "Raw"
 msgid "Pre-Dithered"
 msgstr "Pre-Dithered"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Grayscale"
 
@@ -556,7 +557,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:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr "Raw Channels"
 
@@ -616,15 +617,16 @@ msgstr "AppGamma"
 msgid "Gamma value assumed by application"
 msgstr "Gamma value assumed by 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -632,15 +634,16 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Adjust the cyan gamma"
 
-#: 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -648,15 +651,16 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Adjust the magenta gamma"
 
-#: 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Yellow"
 
@@ -664,10 +668,10 @@ msgstr "Yellow"
 msgid "Adjust the yellow gamma"
 msgstr "Adjust the yellow gamma"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr "Red"
 
@@ -675,8 +679,8 @@ msgstr "Red"
 msgid "Adjust the red gamma"
 msgstr "Adjust the red gamma"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr "Green"
 
@@ -684,10 +688,10 @@ msgstr "Green"
 msgid "Adjust the green gamma"
 msgstr "Adjust the green gamma"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr "Blue"
 
@@ -696,14 +700,16 @@ 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Black"
 
@@ -711,7 +717,7 @@ msgstr "Black"
 msgid "Adjust the black gamma"
 msgstr "Adjust the black gamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr "Cyan Balance"
 
@@ -724,7 +730,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:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 msgid "Magenta Balance"
 msgstr "Magenta Balance"
 
@@ -732,7 +738,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:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 msgid "Yellow Balance"
 msgstr "Yellow Balance"
 
@@ -758,9 +764,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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 msgid "Advanced Output Control"
 msgstr "Advanced Output Control"
 
@@ -909,77 +915,77 @@ msgstr "Gray component reduction curve"
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditional Gutenprint colour conversion"
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Value must be set for %s\n"
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "`%s' is not a valid %s\n"
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, 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:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, 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:620
+#: src/main/printers.c:631
 #, 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:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "%s wrap mode must be %s\n"
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr "no wrap"
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr "wrap around"
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Unknown type parameter %s (%d)\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, 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:761
+#: src/main/printers.c:772
 msgid "Page size is not valid\n"
 msgstr "Page size is not valid\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, 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:788
+#: src/main/printers.c:799
 #, 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:794
+#: src/main/printers.c:805
 msgid "Height must be greater than zero\n"
 msgstr "Height must be greater than zero\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 msgid "Width must be greater than zero\n"
 msgstr "Width must be greater than zero\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -988,7 +994,7 @@ msgstr ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:824
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -997,266 +1003,278 @@ msgstr ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 
-#: src/main/print-escp2.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr "Automatic Printing Mode"
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr "Basic Output Adjustment"
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr "Automatic printing mode"
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Print Quality"
 
-#: src/main/print-escp2.c:228
+#: src/main/print-escp2.c:229
 msgid "Resolution of the print"
 msgstr "Resolution of the print"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr "Enhanced Gloss"
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr "Add gloss enhancement"
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 msgid "Ink Set"
 msgstr "Ink Set"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Printing Direction"
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr "Advanced Output Adjustment"
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Printing direction (unidirectional is higher quality, but slower)"
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr "Borderless"
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr "Print without borders"
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Interleave Method"
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr "Interleave pattern to use"
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr "Adjust dot size as necessary"
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 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:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 msgid "Output Order"
 msgstr "Output Order"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr "Alignment Passes"
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr "Alignment Choices"
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 msgid "Ink change command"
 msgstr "Ink change command"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr "Alternate Alignment Passes"
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 msgid "Alternate Alignment Choices"
 msgstr "Alternate Alignment Choices"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr "Supports Packet Mode"
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+#, fuzzy
+msgid "Supports D4 Packet Mode"
+msgstr "Supports Packet Mode"
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 msgid "Channel Names"
 msgstr "Channel Names"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr "Raw Channel Count"
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 msgid "Cyan Map"
 msgstr "Cyan Map"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 msgid "Adjust the cyan map"
 msgstr "Adjust the cyan map"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 msgid "Magenta Map"
 msgstr "Magenta Map"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 msgid "Adjust the magenta map"
 msgstr "Adjust the magenta map"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 msgid "Yellow Map"
 msgstr "Yellow Map"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 msgid "Adjust the yellow map"
 msgstr "Adjust the yellow map"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 msgid "Blue Map"
 msgstr "Blue Map"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 msgid "Adjust the blue map"
 msgstr "Adjust the blue map"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr "Red Map"
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 msgid "Adjust the red map"
 msgstr "Adjust the red map"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr "Red Density"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr "Adjust the red density"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr "Blue Density"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr "Adjust the blue density"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 msgid "Gloss Level"
 msgstr "Gloss Level"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 msgid "Adjust the gloss level"
 msgstr "Adjust the gloss level"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr "Dark Yellow Transition"
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr "Gray Transition"
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Gray Transition"
 msgstr "Light Gray Transition"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Dark Gray Transition"
 msgstr "Dark Gray Transition"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 msgid "Mid Gray Transition"
 msgstr "Mid Gray Transition"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 msgid "Medium Gray Transition"
 msgstr "Medium Gray Transition"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 msgid "Full Manual Control"
 msgstr "Full Manual Control"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr "Automatic Setting Control"
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manual Control"
 
-#: 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 msgid "Bidirectional"
 msgstr "Bidirectional"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 msgid "Unidirectional"
 msgstr "Unidirectional"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr "Alternate Fill"
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr "Ascending Fill"
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr "Descending Fill"
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr "Ascending Double"
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr "Nearest Neighbour Avoidance"
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, 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:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print options not verified; cannot print.\n"
@@ -1310,128 +1328,129 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 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: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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 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: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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 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: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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 msgid "Five Color Photo Composite"
 msgstr "Five Colour Photo Composite"
 
-#: 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 msgstr "Glossy 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Envelopes"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "Matte Paper"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "Inkjet Paper"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Paper"
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "Photo Paper"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Photo Paper"
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Lustre Photo Paper"
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Paper"
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Other"
 
@@ -1447,50 +1466,50 @@ msgstr "Manual with Pause"
 msgid "Manual without Pause"
 msgstr "Manual without Pause"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr "None"
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 msgid "Glossy"
 msgstr "Glossy"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr "Texture"
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 msgid "Matte"
 msgstr "Matte"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr "Laminate Pattern"
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 msgid "Adjust the cyan balance"
 msgstr "Adjust the cyan balance"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 msgid "Adjust the magenta balance"
 msgstr "Adjust the magenta balance"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 msgid "Adjust the yellow balance"
 msgstr "Adjust the yellow balance"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 msgid "Black Balance"
 msgstr "Black Balance"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 msgid "Adjust the black balance"
 msgstr "Adjust the black balance"
 
@@ -1602,8 +1621,8 @@ msgstr "Colour + Photo Cartridges"
 msgid "PPDFile"
 msgstr "PPDFile"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 msgid "PPD File"
 msgstr "PPD File"
 
@@ -1611,264 +1630,270 @@ msgstr "PPD File"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Image dimensions must match paper dimensions"
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 msgid "Two Level Grayscale"
 msgstr "Two Level Grayscale"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 msgid "Three Level Grayscale"
 msgstr "Three Level Grayscale"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr "Six Colour Enhanced Composite"
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 msgid "Seven Color Photo"
 msgstr "Seven Colour Photo"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr "Seven Colour Enhanced"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 msgid "Eight Color Photo"
 msgstr "Eight Colour Photo"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 msgid "One Color Raw"
 msgstr "One Colour Raw"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 msgid "One Color Raw Enhanced Gloss"
 msgstr "One Colour Raw Enhanced Gloss"
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 msgid "Two Color Raw"
 msgstr "Two Colour Raw"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 msgid "Three Color Raw"
 msgstr "Three Colour Raw"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 msgid "Three Color Raw Gloss"
 msgstr "Three Colour Raw Gloss"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 msgid "Four Color Raw"
 msgstr "Four Colour Raw"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 msgid "Four Color Raw Gloss"
 msgstr "Four Colour Raw Gloss"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 msgid "Five Color Raw"
 msgstr "Five Colour Raw"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 msgid "Six Color Raw"
 msgstr "Six Colour Raw"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six Colour Enhanced Gloss Raw"
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 msgid "Seven Color Raw"
 msgstr "Seven Colour Raw"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Seven Colour Enhanced Gloss Raw"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 msgid "Eight Color Raw"
 msgstr "Eight Colour 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr "EPSON Standard Inks"
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome Photo Black"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 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
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 msgid "Light Magenta"
 msgstr "Light Magenta"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 msgid "Light Black"
 msgstr "Light Black"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 msgid "Dark Yellow"
 msgstr "Dark Yellow"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 msgid "Gloss Optimizer"
 msgstr "Gloss Optimiser"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr "Plain Paper Fast Load"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postcard"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr "Back Light Film"
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 msgid "Matte Paper Heavyweight"
 msgstr "Matte Paper Heavyweight"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium Semigloss Photo Paper"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 msgid "ColorLife Paper"
 msgstr "ColorLife Paper"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 msgid "Archival Matte Paper"
 msgstr "Archival Matte Paper"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr "Roll Feed"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr "Roll Feed (cut each page)"
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 msgid "Roll Feed (do not cut)"
 msgstr "Roll Feed (do not cut)"
 
-#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 msgid "Print to CD"
 msgstr "Print to CD"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 msgid "Manual Sheet Guide"
 msgstr "Manual Sheet Guide"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 msgid "Manual Feed (Front)"
 msgstr "Manual Feed (Front)"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 msgid "Rear Tray"
 msgstr "Rear Tray"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr "Front Tray"
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 msgid "Photo Board"
 msgstr "Photo Board"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr "Cut Sheet Bin 1"
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr "Cut Sheet Bin 2"
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 msgid "Cut Sheet Autoselect"
 msgstr "Cut Sheet Autoselect"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr "Manual Selection"
 
@@ -2730,3383 +2755,3562 @@ msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
 #: src/main/xmli18n-tmp.h:164
+#, fuzzy
+msgid "Canon BJC-5100"
+msgstr "Canon BJC-1000"
+
+#: src/main/xmli18n-tmp.h:165
+#, fuzzy
+msgid "Canon BJC-5500"
+msgstr "Canon BJC-6500"
+
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:173
+#, fuzzy
+msgid "Canon BJC-8500"
+msgstr "Canon BJC-6500"
+
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:181
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:182
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:183
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:184
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:189
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Epson Stylus CX3700"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Epson Stylus DX4200"
+
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 #, fuzzy
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 #, fuzzy
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 #, fuzzy
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Epson PM 700C"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Epson PM 780C"
+
+#: src/main/xmli18n-tmp.h:504
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Colour StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Colour StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Colour StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+#, fuzzy
+msgid "HP LaserJet 1022"
+msgstr "HP LaserJet 1012"
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr "Okidata OL400"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr "Okidata OL400e"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr "Okidata OL410e"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr "Okidata OL600e"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr "Okidata OL800"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+#, fuzzy
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-161"
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 #, fuzzy
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+#, fuzzy
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:983
+#, fuzzy
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/main/xmli18n-tmp.h:985
+#, fuzzy
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/main/xmli18n-tmp.h:986
+#, fuzzy
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:987
+#, fuzzy
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:988
 #, fuzzy
 msgid "Sony DPP-EX5"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "Inch"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "Set the base unit of measurement to inches"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Set the base unit of measurement to centimetres"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Points"
 msgstr "Points"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 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:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Set the base unit of measurement to millimetres"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 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:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "Colour output"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr "Print in shades of gray using black ink"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Standard Command"
 msgstr "Standard Command"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr "Use standard print command"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Custom Command"
 msgstr "Custom Command"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr "Use custom print command"
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "File"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 msgid "Print to a file"
 msgstr "Print to a file"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr "Edit Curve..."
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 msgid "Set Default"
 msgstr "Set Default"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr "Restore Previous"
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Print v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "About"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6114,7 +6318,7 @@ msgstr ""
 "Print and\n"
 "Save Settings"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6122,15 +6326,15 @@ msgstr ""
 "Save\n"
 "Settings"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Print"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Preview"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6154,73 +6358,73 @@ msgstr ""
 "If you click another button while dragging the mouse, the image will return "
 "to its original position."
 
-#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 msgid "Paper Size"
 msgstr "Paper Size"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr "Show All Paper Sizes"
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Dimensions:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Width:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 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:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Height:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 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:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 msgid "Automatic Paper Size"
 msgstr "Automatic Paper Size"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr "Number of Copies"
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 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:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 msgid "Image Position"
 msgstr "Image Position"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Landscape"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "Upside down"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Seascape"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6228,120 +6432,120 @@ msgstr ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Orientation:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Left:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Right:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 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:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Top:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 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:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Bottom:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 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:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "Centre:"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "Centre the image horizontally on the paper"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Both"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "Centre the image on the paper"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Vertical"
 msgstr "Vertical"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "Centre the image vertically on the paper"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Setup Printer"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 msgid "Printer Make:"
 msgstr "Printer Make:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 msgid "Select the make of your printer"
 msgstr "Select the make of your printer"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Printer Model:"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "Select your printer model"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "PPD File:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Enter the correct PPD filename for your printer"
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Browse"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Choose the correct PPD filename for your printer"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -6349,52 +6553,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:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 msgid "Printer Queue:"
 msgstr "Printer Queue:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "Enter the correct command to print to your printer. "
 msgstr "Enter the correct command to print to your printer. "
 
-#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr "Enter the file to print to. "
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 msgid "File to print to"
 msgstr "File to print to"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 msgid "Print To File"
 msgstr "Print To File"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "Define New Printer"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "Printer Name:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 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:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 msgid "About Gutenprint "
 msgstr "About Gutenprint "
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 msgid "Gutenprint Version "
 msgstr "Gutenprint Version "
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Printer Settings"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6402,11 +6606,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:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "Setup Printer..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6414,11 +6618,11 @@ msgstr ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "New Printer..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6426,23 +6630,32 @@ 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:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Set Defaults"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 msgid "Image Size"
 msgstr "Image Size"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Scaling:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "Set the scale (size) of the image"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr "Scale by:"
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6450,31 +6663,31 @@ msgstr ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Percent"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "Scale the print to the size of the page"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 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:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "Set the width of the print"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "Set the height of the print"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6482,65 +6695,65 @@ msgstr ""
 "Use Original\n"
 "Image Size"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 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:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "Print Colour Adjust"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Set Defaults"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Close"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Image preview"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr "View Output Channels:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 msgid "Output"
 msgstr "Output"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Output Type:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "Select the desired output type"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "Adjust Output..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Adjust colour balance, brightness, contrast, saturation, and dither algorithm"
 
-#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 msgid "Size Units:"
 msgstr "Size Units:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Units:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "Select the base unit of measurement for printing"
 
@@ -6573,11 +6786,11 @@ msgstr "Berkeley lpd (/usr/libexec/lpc)"
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 msgid "Printer"
 msgstr "Printer"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 msgid "(Default Printer)"
 msgstr "(Default Printer)"
 
@@ -6625,85 +6838,85 @@ msgstr "Maximum possible value for Y"
 msgid "_Gamma value"
 msgstr "_Gamma value"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 msgid "Printer Features"
 msgstr "Printer Features"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 msgid "Output Control"
 msgstr "Output Control"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 msgid "Common"
 msgstr "Common"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "English-GB"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "UTF-8"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "Double-Sided Printing"
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr "No"
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr "Yes"
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 #, fuzzy
 msgid "Value"
 msgstr "Blue"
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr "Fine Adjustment"
 
@@ -6746,6 +6959,7 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
 #: src/escputil/escputil.c:119
+#, fuzzy
 msgid ""
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
@@ -6781,12 +6995,12 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
@@ -6833,7 +7047,7 @@ msgstr ""
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -6917,88 +7131,93 @@ msgstr ""
 "    -C Specify the number of pattern choices for alignment\n"
 "    -p Specify the number of sets of patterns for alignment\n"
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "You may only specify one printer or raw device."
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "You may only specify one printer model."
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr "Alignment choices must be at least 1."
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr "Alignment passes must be at least 1."
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Unknown option %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr "Usage: %s [OPTIONS] command\n"
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr "Type `%s --help' for more information.\n"
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr "Type `%s -h' for more information.\n"
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Cannot open device %s: %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Cannot print to printer %s with %s\n"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Unable to send command to printer\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr "Read from printer timed out\n"
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Cannot read from %s: %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Cannot open %s read/write: %s\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Unknown option %c\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Cannot write to %s: %s\n"
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7007,7 +7226,7 @@ msgstr ""
 "\n"
 "Cannot write to %s: %s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7018,214 +7237,212 @@ msgstr ""
 "Cannot detect printer type.\n"
 "Please use -m to specify your printer model.\n"
 
-#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr "Status: Error\n"
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Status: Self-Printing\n"
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Status: Busy\n"
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Status: Waiting\n"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Status: Idle\n"
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Status: Paused\n"
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Status: Cleaning\n"
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "Status: Factory shipment\n"
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Status: Shutting down\n"
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Status: Unknown (%d)\n"
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Error: Fatal Error\n"
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Error: Other interface is selected\n"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Error: Cover Open\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Error: Paper jam\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Error: Ink out\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Error: Paper out\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Error: Wait return from the tear-off position\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Error: Double feed error\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr "Error: Unrecoverable cutter error\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr "Error: Recoverable cutter jam\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr "Error: CD Tray Out\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Error: Card loading error\n"
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr "Error: Tray cover open\n"
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Error: Unknown (%d)\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Printing nozzle self-test\n"
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Ink Levels:\n"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 msgstr "Ink colour"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "Percent remaining"
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr "Warning: Black Ink Low\n"
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Warning: Unknown (%d)\n"
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr "Job Name: "
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr "ink levels"
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr "status"
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Obtaining %s requires using a raw device.\n"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Obtaining extended ink information requires using a raw device.\n"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr "Part number"
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr "Date"
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Printer identification requires using a raw device.\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Cannot identify printer model.\n"
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Cleaning heads...\n"
@@ -7380,7 +7597,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Unable to send command to the printer, exiting.\n"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr "Exiting\n"
@@ -7406,7 +7623,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7495,9 +7712,9 @@ msgid "Final command was not confirmed.\n"
 msgstr "Final command was not confirmed.\n"
 
 #: src/escputil/escputil.c:1908
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7511,12 +7728,12 @@ msgstr ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "Press enter to continue > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7527,42 +7744,42 @@ msgstr ""
 "pattern.\n"
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "Pass #%d"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Please insert a fresh sheet of paper.\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Number out of range!\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "I cannot understand what you typed!\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "The best pair of lines should be numbered between 1 and %d.\n"
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Attempting to set alignment..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "succeeded.\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7575,7 +7792,7 @@ msgstr ""
 "pattern %d.  If it is not, you should repeat the process to get the best\n"
 "quality printing.\n"
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "Error in input\n"
diff --git a/po/es.gmo b/po/es.gmo
index 25525cf..5cd1700 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 0425082..a156fed 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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"
@@ -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:1737
+#: src/main/print-escp2.c:1752
 #, fuzzy
 msgid "Default"
 msgstr "Establecer por Omisión"
@@ -84,16 +84,16 @@ msgstr ""
 msgid "Density"
 msgstr "Densidad:"
 
-#: 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -154,27 +154,27 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmo de Entramado"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -183,286 +183,287 @@ msgstr "Tamaño"
 msgid "Basic Printer Setup"
 msgstr "Configuración de la Impresora"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Tamaño del papel al que desea imprimir"
 
-#: 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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "Tipo de Medio"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "Fuente de Medio"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: src/main/print-pcl.c:1209 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, fuzzy
 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:234 src/main/print-escp2.c:215
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Resolución"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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"
 
-#: 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-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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"
 
-#: 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-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: 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"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: 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"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: 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"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: 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"
 
-#: 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-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: 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: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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: 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:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Personalizado"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 #, fuzzy
 msgid "Print To Hub"
 msgstr "¿Imprimir a un archivo?"
 
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Color"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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
@@ -503,9 +504,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Imprimir"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Tonos de gris"
 
@@ -592,7 +593,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:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr ""
 
@@ -661,15 +662,16 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Cian"
 
@@ -678,15 +680,16 @@ msgstr "Cian"
 msgid "Adjust the cyan gamma"
 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -695,15 +698,16 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Amarillo"
 
@@ -712,10 +716,10 @@ msgstr "Amarillo"
 msgid "Adjust the yellow gamma"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr ""
 
@@ -724,8 +728,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr ""
 
@@ -734,10 +738,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr ""
 
@@ -747,14 +751,16 @@ msgid "Adjust the blue gamma"
 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Negro"
 
@@ -763,7 +769,7 @@ msgstr "Negro"
 msgid "Adjust the black gamma"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr ""
 
@@ -778,7 +784,7 @@ msgstr "Tonos de gris"
 msgid "Adjust the cyan gray balance"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -788,7 +794,7 @@ msgstr "Magenta"
 msgid "Adjust the magenta gray balance"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Ajusta el balance amarillo de la impresión"
@@ -819,9 +825,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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Tipo de salida:"
@@ -988,384 +994,395 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s no es un parámetreo válido del tipo %s\n"
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Impresora desconocida %s\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, 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"
 
-#: src/main/printers.c:761
+#: src/main/printers.c:772
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "La medida de la imagen no es válida\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, 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:788
+#: src/main/printers.c:799
 #, 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:794
+#: src/main/printers.c:805
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "El margen izquierdo no debe ser menos que cero\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "El margen superior no debe ser menos que cero\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, 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:813
+#: src/main/printers.c:824
 #, 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: 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:228
+#: src/main/print-escp2.c:229
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Resolución y calidad de la impresión"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 #, fuzzy
 msgid "Ink Set"
 msgstr "Tipo de Tinta"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 #, fuzzy
 msgid "Output Order"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 #, fuzzy
 msgid "Ink change command"
 msgstr "Comando no reconocido.\n"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Repitiendo el proceso de alineación.\n"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 #, fuzzy
 msgid "Channel Names"
 msgstr "Cancelar"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Cian"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Amarillo"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Blue Map"
 msgstr "Blanco y Negro"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Película Brillante"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 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: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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Estándar"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamaño"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, 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:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1419,128 +1436,129 @@ msgid "test print"
 msgstr "prueba de impresión"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 msgid "Four Color Standard"
 msgstr "Cuatro Colores Estándard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 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: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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 msgid "Six Color Photo"
 msgstr "Fotografía de Seis Colores"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: 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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 msgid "Five Color Photo Composite"
 msgstr "Fotografía Compuesta de Cinco Colores"
 
-#: 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 msgid "Transparencies"
 msgstr "Transparencias"
 
-#: 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Sobres"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "Papel Opaco"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "Papel para Chorro de Tinta"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papel de Calidad Fotográfica para Chorro de Tinta"
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "Papel para Fotografía"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografía Premium Luster"
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel Brillante de Calidad Fotográfica"
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr "Papel Pesado 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Otro"
 
@@ -1556,56 +1574,56 @@ msgstr "Manual con Pausa"
 msgid "Manual without Pause"
 msgstr "Manual sin Pausa"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 #, fuzzy
 msgid "Glossy"
 msgstr "Película Brillante"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 #, fuzzy
 msgid "Matte"
 msgstr "Papel Opaco"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 #, fuzzy
 msgid "Black Balance"
 msgstr "Blanco y Negro"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Ajustar el balance de cian de la impresión"
@@ -1720,8 +1738,8 @@ msgstr "Cartuchos Color + Fotografía"
 msgid "PPDFile"
 msgstr "Archivo PPD:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 #, fuzzy
 msgid "PPD File"
 msgstr "¿Archivo PPD?"
@@ -1730,302 +1748,308 @@ msgstr "¿Archivo PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Tonos de gris"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "Tonos de gris"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr "Siete Colores Mejorados"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Siete Colores Mejorados"
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Cuatro Colores Estándard"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Tres Colores Compuestos"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Tres Colores Compuestos"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Cuatro Colores Estándard"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Cuatro Colores Estándard"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Siete Colores Mejorados"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 #, fuzzy
 msgid "Eight Color Raw"
 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 #, 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 #, 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 #, 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 #, fuzzy
 msgid "Light Black"
 msgstr "Negro"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Amarillo"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Película Brillante"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 #, 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr "Papel Común Carga Rápida"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postal"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 #, fuzzy
 msgid "Back Light Film"
 msgstr "Back Light Film"
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Papel Opaco"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papel Común"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Papel Opaco"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr "Alimentación por Rollo"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 #, 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 #, fuzzy
 msgid "Print to CD"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manual"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manual"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Bandeja"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 #, fuzzy
 msgid "Photo Board"
 msgstr "Papel para Fotografía"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Autoseleccionar"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr ""
 
@@ -2947,3579 +2971,3748 @@ msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon BJC-6000"
+msgid "Canon BJC-5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon BJC-6100"
+msgid "Canon BJC-5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon BJC-6200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon BJC-6500"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon BJC-7000"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "Canon BJC-7100"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "Canon BJC-8200"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "Canon S100"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "Canon S200"
+msgid "Canon BJC-8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "Canon S300"
+msgid "Canon BJC-8500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "Canon S400"
+msgid "Canon S100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "Canon S450"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "Canon S500"
+msgid "Canon S300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "Canon S600"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "Canon S630"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "Canon S800"
+msgid "Canon S500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "Canon S4500"
+msgid "Canon S600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "Canon PIXMA iP2000"
+msgid "Canon S630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "Canon PIXMA iP3000"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "Canon PIXMA iP3100"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "Canon PIXMA iP4000"
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "Canon PIXMA iP4100"
+msgid "Canon PIXMA iP3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "Canon PIXMA iP4200"
+msgid "Canon PIXMA iP3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:188
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:217
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:398
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:407
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:412
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:415
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:418
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:504
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+msgid "HP LaserJet 1022"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Nombre de la Impresora:"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+msgid "Sharp AR-M257"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Configuración de la Impresora"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+msgid "Canon SELPHY-CP-720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:983
+msgid "Canon SELPHY-CP-740"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:985
+msgid "Canon SELPHY ES1"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:986
+msgid "Canon SELPHY ES2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:987
+msgid "Canon SELPHY ES20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:988
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "Pulgada"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "Seleccionar la unidad base de medida a pulgadas"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Points"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, 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:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 #, 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:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "Salida de color"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr "Imprimir en sombras de gris usando tinta negra"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Standard Command"
 msgstr "Estándar"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Custom Command"
 msgstr "Comando:"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Archivo"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 #, fuzzy
 msgid "Print to a file"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 #, fuzzy
 msgid "Set Default"
 msgstr "Establecer por Omisión"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "Aceptar"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Imprimir v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "Acerca de"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 #, fuzzy
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr "Configuración de la Impresora"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 #, fuzzy
 msgid ""
 "Save\n"
 "Settings"
 msgstr "Guardar Conf."
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 #, fuzzy
 msgid ""
 "Position the image on the page.\n"
@@ -6545,76 +6738,76 @@ msgstr ""
 "Si presiona otro botón mientras arrastra el ratón, la imagen volverá a\n"
 "posición original\n"
 
-#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 #, fuzzy
 msgid "Paper Size"
 msgstr "Tamaño"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Dimensiones:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Ancho:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 msgid "Width of the paper that you wish to print to"
 msgstr "Ancho del papel al que desea imprimir"
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Altura:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 msgid "Height of the paper that you wish to print to"
 msgstr "Altura del papel al que desea imprimir"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Tamaño"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 #, fuzzy
 msgid "Image Position"
 msgstr "Posición"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Automático"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Vertical"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Apaisado"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "Invertido"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Horizontal invertido"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6622,127 +6815,127 @@ msgstr ""
 "Seleccionar la orientación: vertical, horizontal, invertido,  ú horizontal "
 "invertido "
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Orientación:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Izquierda:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Derecha:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 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:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Arriba:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 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:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Abajo:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 #, 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:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 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:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "Centrado: "
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "Centrar la imagen horizontalmente en el papel"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Ambos"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "Centrar la imagen en el papel"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertical"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "Centrar la imagen verticalmente en el papel"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Configuración de la Impresora"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Nombre de la Impresora:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Seleccionar su madelo de impresora"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Modelo de Impresora:"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "Seleccionar su madelo de impresora"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "Archivo PPD:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Ingrese el nombre de archivo PPD correcto para su impresora"
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Explorar"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Elija el nombre de archivo PPD correcto para su impresora"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -6751,58 +6944,58 @@ msgstr ""
 "Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
 "que desea imprimir"
 
-#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Nombre de la Impresora:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, 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:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 #, fuzzy
 msgid "File to print to"
 msgstr "prueba de impresión"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 #, fuzzy
 msgid "Print To File"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "Nombre de la Impresora:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Ingrese el nombre que desea dar a ésta impresora lógica"
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Acerca de Gimp-Print..."
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Versión de Gimp-Print "
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Configuración de la Impresora"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6810,11 +7003,11 @@ msgstr ""
 "Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
 "que desea imprimir"
 
-#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "Conf. Impresora..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6822,11 +7015,11 @@ msgstr ""
 "Elegir el modelo de impresora, archivo PPD, y comando que se usa para "
 "imprimir a ésta impresora"
 
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "Impresora Nueva..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6834,24 +7027,33 @@ 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."
 
-#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Establecer por Omisión"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 #, fuzzy
 msgid "Image Size"
 msgstr "Tamaño"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Escala:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "Establecer la escala (el tamaño) de la imagen"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr "Escalar por:"
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6859,31 +7061,31 @@ 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."
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Porcentaje"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "Redimensionar la impresión al tamaño de la página"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPP"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr "Redimensionar la impresión al tamaño de los puntos por pulgada"
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "Establecer el ancho de la impresión"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "Establecer el alto de la impresión"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6891,69 +7093,69 @@ msgstr ""
 "Usar Medida Orig.\n"
 "de la Imagen"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 msgid "Set the print size to the size of the image"
 msgstr "Establecer la medida de impresión a la medida de la imagen"
 
-#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "Ajuste de Impresión en Color"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Establecer por Omisión"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Vista previa de imagen"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 #, fuzzy
 msgid "Output"
 msgstr "Tipo de salida:"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Tipo de salida:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "Seleccionar el tipo de salida deseado"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "Ajustar Salida..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 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:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 #, fuzzy
 msgid "Size Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "Seleccionar la unidad base de medida para imprimir"
 
@@ -6986,12 +7188,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 #, fuzzy
 msgid "Printer"
 msgstr "Imprimir"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Configuración de la Impresora"
@@ -7041,90 +7243,90 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 #, fuzzy
 msgid "Printer Features"
 msgstr "Configuración de la Impresora"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Output Control"
 msgstr "Tipo de salida:"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 #, fuzzy
 msgid "Common"
 msgstr "Comando:"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Extra 1"
 msgstr "Bandeja 1"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 2"
 msgstr "Bandeja 2"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 3"
 msgstr "Bandeja 3"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 4"
 msgstr "Bandeja 4"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Spanish"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -7203,12 +7405,12 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
@@ -7258,7 +7460,7 @@ msgstr ""
 "    -m|--model         Especificar el modelo preciso de impresora para\n"
 "\t\t\talineación de cabezal.\n"
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
@@ -7346,88 +7548,93 @@ msgstr ""
 "    -m Especificar el modelo preciso de impresora para\n"
 "\t alineación de cabezal.\n"
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Usted sólo puede especificar una impresora ó dispositivo crudo."
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Usted sólo puede especificar un modelo de impresora"
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Opción desconocida %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "No puedo abrir dispositivo %s: %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "No puedo imprimir a impresora %s con %s\n"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "No puedo enviar comando a impresora\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "No puedo leer %s de: %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "El estado de la impresora requiere el uso de un dispositivo crudo.\n"
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "No puedo abrir %s  para lectura/escritura: %s\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Opción desconocida %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "No puedo escribir a %s: %s\n"
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7436,7 +7643,7 @@ msgstr ""
 "\n"
 "No puedo escribir a %s: %s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7447,217 +7654,215 @@ msgstr ""
 "No puedo detectar el tipo de impresora.\n"
 "Favor de usar -m para especificar su modelo de impresora.\n"
 
-#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Saturación:"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "Error en entrada\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "Error en entrada\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 msgstr "Color de tinta"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "Porcentaje restante"
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, 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"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, 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"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, 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"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Usted sólo puede especificar un modelo de impresora"
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Limpiando inyectores...\n"
@@ -7825,7 +8030,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "No puedo enviar comando a la impresora, saliendo.\n"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr ""
@@ -7851,7 +8056,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7941,9 +8146,9 @@ msgid "Final command was not confirmed.\n"
 msgstr "El comando final no fue confirmado.\n"
 
 #: src/escputil/escputil.c:1908
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7957,12 +8162,12 @@ msgstr ""
 "Favor de poner una hoja de papel en la impresora para comenzar el\n"
 "procedimiento de alineación del cabezal.\n"
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "Presione enter para continuar > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7973,42 +8178,42 @@ msgstr ""
 "patrón.\n"
 "Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "Pasar #%d"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Favor de insertar una hoja de papel sin imprimir.\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "¡Número fuera de rango!\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "¡No puedo entender lo que usted ha tipeado!\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, 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"
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Intentando definir alineación..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "éxito.\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -8021,7 +8226,7 @@ msgstr ""
 "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
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "Error en entrada\n"
@@ -9069,9 +9274,6 @@ msgstr "Traer próxima fila falló en %d\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"
 
-#~ msgid "Unknown option %s\n"
-#~ msgstr "Opción desconocida %s\n"
-
 #~ msgid "1440 x 360 DPI"
 #~ msgstr "1440 x 360 PPP"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 73a40dd..61d4d48 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index e4ad98b..1a2b2d1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 5.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-17 11:45-0400\n"
-"PO-Revision-Date: 2006-05-28 10:05-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\n"
+"PO-Revision-Date: 2007-12-01 21:56-0500\n"
 "Last-Translator: regis rampnoux <regisr@pobox.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\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:1737
+#: src/main/print-escp2.c:1752
 msgid "Default"
 msgstr "Défaut"
 
@@ -81,16 +81,16 @@ msgstr "Pré tramé"
 msgid "Density"
 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -149,26 +149,26 @@ msgstr "Module de conversion de couleur"
 msgid "Dither algorithm"
 msgstr "Algorithme de tramage"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 msgid "Page Size"
 msgstr "Format papier "
 
-#: 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -176,273 +176,274 @@ msgstr "Format papier "
 msgid "Basic Printer Setup"
 msgstr "Configuration de base de l'imprimante"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: 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: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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "Type de support"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "Source du support"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr "Taille du moyeu du CD"
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 #, fuzzy
 msgid "CD Hub Size (Custom)"
 msgstr "Taille du moyeu du CD"
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, 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
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 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
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Résolution"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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"
 
-#: 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-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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"
 
-#: 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-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr "Encres (canaux)"
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr "Fonctionalités avancées"
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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"
 
-#: 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-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "Impression double face"
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr "Paramètres Duplex"
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 msgid "Cyan Density"
 msgstr "Densité cyan"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr "Ajustement de la densité de cyan"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 msgid "Magenta Density"
 msgstr "Densité magenta"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr "Ajustement de la densité de magenta"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 msgid "Yellow Density"
 msgstr "Densité jaune"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr "Ajustement de la densité de jaune"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 msgid "Black Density"
 msgstr "Densité du noir"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr "Ajustement du niveau de densité"
 
-#: 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-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: 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: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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr "Réglage avancé des encres"
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: 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:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 msgid "Light Yellow Transition"
 msgstr "Transition jaune clair"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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é"
 
-#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr "Côté long (standard)"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr "Côté court (retourné)"
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "CD - 5 pouces"
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "CD - 3 pouces"
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Personnalisé"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Couleur"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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"
@@ -480,9 +481,9 @@ msgstr "Raw"
 msgid "Pre-Dithered"
 msgstr "Pré-tramé"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Niveaux de gris"
 
@@ -562,7 +563,7 @@ msgid "Output image type"
 msgstr "Type de sortie :"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr "Canaux raw"
 
@@ -625,15 +626,16 @@ msgstr ""
 msgid "Gamma value assumed by application"
 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -641,15 +643,16 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -657,15 +660,16 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Jaune"
 
@@ -673,10 +677,10 @@ msgstr "Jaune"
 msgid "Adjust the yellow gamma"
 msgstr "Réglage du gamma pour le jaune"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr "Rouge"
 
@@ -684,8 +688,8 @@ msgstr "Rouge"
 msgid "Adjust the red gamma"
 msgstr "Réglage du gamma pour le rouge"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr "Vert"
 
@@ -693,10 +697,10 @@ msgstr "Vert"
 msgid "Adjust the green gamma"
 msgstr "Réglage du gamma pour le vert"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr "Bleu"
 
@@ -705,14 +709,16 @@ msgid "Adjust the blue gamma"
 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Noir"
 
@@ -720,7 +726,7 @@ msgstr "Noir"
 msgid "Adjust the black gamma"
 msgstr "Réglage du gamma pour le noir"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr "Niveau de cyan"
 
@@ -733,7 +739,7 @@ msgstr "Balance des gris"
 msgid "Adjust the cyan gray balance"
 msgstr "Réglage du cyan pour la balance des gris"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 msgid "Magenta Balance"
 msgstr "Niveau de magenta"
 
@@ -741,7 +747,7 @@ msgstr "Niveau de magenta"
 msgid "Adjust the magenta gray balance"
 msgstr "Réglage du magenta pour la balance des gris"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 msgid "Yellow Balance"
 msgstr "Niveau de jaune"
 
@@ -768,9 +774,9 @@ 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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 msgid "Advanced Output Control"
 msgstr "Controle avancé de la sortie"
 
@@ -921,77 +927,77 @@ msgstr "Courbe de la composante gris"
 msgid "Traditional Gutenprint color conversion"
 msgstr "Conversion de couleur traditionelle Gutenprint"
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Valeur à définir pour: %s\n"
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, 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:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s doit être entre %f et %f (actuellement %f)\n"
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s doit être entre %d et %d (actuellement %d)\n"
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "%s limites doivent être entre %f et %f\n"
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "%s wrap mode doit être %s\n"
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "paramètre de type inconnu %s (%d)\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, 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:761
+#: src/main/printers.c:772
 msgid "Page size is not valid\n"
 msgstr "La taille de la page n'est pas valide\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, 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"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:799
 #, 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"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:805
 msgid "Height must be greater than zero\n"
 msgstr "La hauteur doit être supérieure à zéro\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 msgid "Width must be greater than zero\n"
 msgstr "La largeur doit être plus grande que zéro\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1000,7 +1006,7 @@ msgstr ""
 "L'image est trop large pour la page: marge gauche %d, largeur %d, bord droit "
 "%d\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:824
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1009,268 +1015,280 @@ msgstr ""
 "L'image est trop haute pour la page: marge en haut %d, hauteur %d, bord du "
 "bas %d\n"
 
-#: src/main/print-escp2.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr "Mode d'impression automatique"
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr "Réglage de base"
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr "Mode d'impression automatique"
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Qualité d'impression"
 
-#: src/main/print-escp2.c:228
+#: src/main/print-escp2.c:229
 msgid "Resolution of the print"
 msgstr "Résolution de l'impression"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr "Amélioration de la brillance"
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr "Ajouter l'amélioration de brillance"
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 msgid "Ink Set"
 msgstr "Jeu d'encres"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Sens d'impression"
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr "Réglage avancé de sorties"
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 "Sens d'impression (unidirectionnel est de meilleure qualité mais plus lent)"
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr "sans marges"
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr "Impression sans marges"
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Méthode d'entrelacement"
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr "Motif d'entrelacement"
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr "Ajuster la taille des gouttes si nécessaire"
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 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"
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 msgid "Output Order"
 msgstr "Ordre de sortie"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 msgid "Ink change command"
 msgstr "Commande de changement d'encre"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 msgid "Alternate Alignment Choices"
 msgstr "Choix d'alignement alternatif"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr "Supporte le mode paquet"
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+#, fuzzy
+msgid "Supports D4 Packet Mode"
+msgstr "Supporte le mode paquet"
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 msgid "Channel Names"
 msgstr "Nom des canaux"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 msgid "Cyan Map"
 msgstr "Carte du cyan"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 msgid "Adjust the cyan map"
 msgstr "Modification de la carte du cyan"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 msgid "Magenta Map"
 msgstr "Carte du magenta"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 msgid "Adjust the magenta map"
 msgstr "Modification de la carte du majenta"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 msgid "Yellow Map"
 msgstr "Carte du jaune"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 msgid "Adjust the yellow map"
 msgstr "Modification de la carte du jaune"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 msgid "Blue Map"
 msgstr "Carte du bleu"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 msgid "Adjust the blue map"
 msgstr "Modification de la carte du bleu"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr "Carte du rouge"
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 msgid "Adjust the red map"
 msgstr "Modification de la carte du rouge"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr "Densité du rouge"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr "Ajuste la densité du rouge"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr "Densité du bleu"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr "Ajuste la densité du bleu"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 msgid "Gloss Level"
 msgstr "Niveau de brillance"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 msgid "Adjust the gloss level"
 msgstr "Ajuste le niveau de brillance"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr "transition jaune foncé"
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr "Transition gris"
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Gray Transition"
 msgstr "Transition cyan clair"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Dark Gray Transition"
 msgstr "Transition gris foncé"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 msgid "Mid Gray Transition"
 msgstr "Transition gris médian"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 msgid "Medium Gray Transition"
 msgstr "Transition gris moyen"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 msgid "Full Manual Control"
 msgstr "Contrôle manuel complet"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr "Controle réglage automatique"
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Controle manuel"
 
-#: 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 msgid "Bidirectional"
 msgstr "Bidirectionnel"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 msgid "Unidirectional"
 msgstr "Unirectionnel"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr "en alternance"
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr "en montant"
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr "en descendant"
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr "en montant - double"
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr "en évitant les voisins"
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, 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:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: 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"
@@ -1324,128 +1342,129 @@ msgid "test print"
 msgstr "test d'impression"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 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: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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 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: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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 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: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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 msgid "Five Color Photo Composite"
 msgstr "Cinq couleurs photo composite"
 
-#: 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 msgstr "Film brillant"
 
-#: 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Enveloppes"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "Papier Mat"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "Papier jet d'encre"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier jet d'encre qualité photo"
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "Papier photo"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr "Papier glacé photo Premium"
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr "Papier photo Premium Luster"
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr "Papier glacé qualité photo"
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Autre"
 
@@ -1461,50 +1480,50 @@ msgstr "Manuel avec pause"
 msgid "Manual without Pause"
 msgstr "Manuel sans pause"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr "Couché"
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr "Aucun"
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 msgid "Glossy"
 msgstr "Brillant"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr "Texture"
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 msgid "Matte"
 msgstr "Mat"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr "Motif du vernis protecteur"
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 msgid "Adjust the cyan balance"
 msgstr "Réglage balance cyan"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 msgid "Adjust the magenta balance"
 msgstr "Réglage balance magenta"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 msgid "Adjust the yellow balance"
 msgstr "Réglage balance jaune"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 msgid "Black Balance"
 msgstr "Balance du noir"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 msgid "Adjust the black balance"
 msgstr "Réglage de la balance du noir"
 
@@ -1616,8 +1635,8 @@ msgstr "Cartouches couleur et photo"
 msgid "PPDFile"
 msgstr "Fichier PPD"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 msgid "PPD File"
 msgstr "Fichier PPD"
 
@@ -1625,264 +1644,270 @@ msgstr "Fichier PPD"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Les dimensions de l'image doivent correspondre à celles du papier"
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 msgid "Two Level Grayscale"
 msgstr "EChelle de gris à deux niveaux"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 msgid "Three Level Grayscale"
 msgstr "Trois niveaux de gris"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr "Six couleurs amélioré composite"
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 msgid "Seven Color Photo"
 msgstr "Photo sept couleurs"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr "Sept couleurs amélioré"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 msgid "Eight Color Photo"
 msgstr "Huit couleurs photo"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 msgid "One Color Raw"
 msgstr "Une couleur de base"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Une couleur de base optimiseur de brillance"
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 msgid "Two Color Raw"
 msgstr "Deux couleurs de base"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 msgid "Three Color Raw"
 msgstr "Trois couleurs de base"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 msgid "Three Color Raw Gloss"
 msgstr "Trois couleurs de base brillant"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 msgid "Four Color Raw"
 msgstr "Quatre couleurs de base"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 msgid "Four Color Raw Gloss"
 msgstr "Quatre couleurs de base brillant"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 msgid "Five Color Raw"
 msgstr "Cinq couleurs de base"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 msgid "Six Color Raw"
 msgstr "Six couleurs de base"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six couleurs de base Optimiseur de brillance"
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 msgid "Seven Color Raw"
 msgstr "Sept couleurs de base"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sept couleurs de base Optimiseur de brillance"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 msgid "Eight Color Raw"
 msgstr "Huit couleurs de base"
 
-#: 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr "Encres standard EPSON"
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 msgid "UltraChrome Photo Black"
 msgstr "Ultrachrome noir photo"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr "Ultrachrome noir mat"
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 msgid "Light Magenta"
 msgstr "Magenta clair"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 msgid "Light Black"
 msgstr "Noir clair"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 msgid "Dark Yellow"
 msgstr "Jaune foncé"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 msgid "Gloss Optimizer"
 msgstr "Optimiseur de brillance"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr "Papier normal chargement rapide"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Carte postale"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr "Film back light"
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 msgid "Matte Paper Heavyweight"
 msgstr "Papier Mat Heavyweight"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 msgid "Premium Semigloss Photo Paper"
 msgstr "Papier semi-brillant photo Premium"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 msgid "ColorLife Paper"
 msgstr "Papier Colorlife"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 msgid "Archival Matte Paper"
 msgstr "Papier Mat Archival"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr "Alimentation rouleau"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr "Alimentation rouleau (couper chaque page)"
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 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
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 msgid "Print to CD"
 msgstr "Imprimer un CD"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 msgid "Manual Sheet Guide"
 msgstr "Alimentation guide par feuille (arrière)"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 msgid "Manual Feed (Front)"
 msgstr "Alimentation manuelle (avant)"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 msgid "Rear Tray"
 msgstr "Bac arrière"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr "Bac avant"
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 msgid "Photo Board"
 msgstr "Carte photo"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr "Coupe papier Bin 1"
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr "Coupe papier Bin 2"
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 msgid "Cut Sheet Autoselect"
 msgstr "Sélection de coupe automatique"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr "Sélection manuelle"
 
@@ -2744,3383 +2769,3562 @@ msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
 #: src/main/xmli18n-tmp.h:164
+#, fuzzy
+msgid "Canon BJC-5100"
+msgstr "Canon BJC-1000"
+
+#: src/main/xmli18n-tmp.h:165
+#, fuzzy
+msgid "Canon BJC-5500"
+msgstr "Canon BJC-6500"
+
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:173
+#, fuzzy
+msgid "Canon BJC-8500"
+msgstr "Canon BJC-6500"
+
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:181
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:182
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:183
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:184
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:189
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C44"
 msgstr "EPSON Stylus C44"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 msgid "Epson Stylus CX1500"
 msgstr "Epson  Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson  Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson  Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Epson  Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Epson Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3600"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Epson Stylus DX4200"
+
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 #, fuzzy
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 #, fuzzy
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 #, fuzzy
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr "Canon CL 700"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Epson PM 700C"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Epson PM 780C"
+
+#: src/main/xmli18n-tmp.h:504
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 msgid "Generic PCL 4 Printer"
 msgstr "Imprimante générique PCL 4"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 msgid "Generic PCL 5 Printer"
 msgstr "Imprimante générique PCL 5"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 msgid "Generic PCL 5c Printer"
 msgstr "Imprimante générique PCL5 c"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 msgid "Generic PCL 5e Printer"
 msgstr "Imprimante générique PCL 5e"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Imprimante générique PCL 6/PCL XL"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5500"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4O"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+#, fuzzy
+msgid "HP LaserJet 1022"
+msgstr "HP LaserJet 1012"
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1120"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr "Okidata OL400"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr "Okidata OL400e"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr "Okidata OL410e"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr "Okidata OL600e"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr "Okidata OL800"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr "\"Samsung ML-6000"
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+#, fuzzy
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-161"
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 #, fuzzy
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr "Olympus P-3000"
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+#, fuzzy
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:983
+#, fuzzy
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/main/xmli18n-tmp.h:985
+#, fuzzy
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/main/xmli18n-tmp.h:986
+#, fuzzy
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:987
+#, fuzzy
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:988
 #, fuzzy
 msgid "Sony DPP-EX5"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr "Données brutes (raw) 16 bits"
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr "Données brutes (raw) 8 bits"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "Pouce"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "Défini l'unité de base de mesure en pouce"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Défini l'unité de base de mesure en centimètres"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Points"
 msgstr "Points"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Défini l'unité de base de mesure en points (1/72\")"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Défini l'unité de base de mesure en millimètres"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Défini l'unité de base de mesure en pica (1/72\")"
 
-#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "Sortie couleur"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr "Imprimer en niveaux de gris en utilisant l'encre noire"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Standard Command"
 msgstr "Commande standard"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr "Utiliser la commande d'impression standard"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Custom Command"
 msgstr "Commande personnalisée"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr "Utiliser une commande personnalisée"
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Fichier"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 msgid "Print to a file"
 msgstr "Imprimer dans un fichier"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr "Editer la courbe..."
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 msgid "Set Default"
 msgstr "Valeurs par défaut"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr "Valeurs précédentes"
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "Valider"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Print v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "À propos"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6128,7 +6332,7 @@ msgstr ""
 "Imprimer et enregistrer\n"
 "les réglages"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6136,15 +6340,15 @@ msgstr ""
 "Enregistrer\n"
 "les réglages"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Imprimer"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Aperçu"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6169,73 +6373,73 @@ msgstr ""
 "Si vous cliquez un autre bouton tandis que vous bougez la souris, l'image "
 "retournera à sa position de départ."
 
-#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 msgid "Paper Size"
 msgstr "Taille du papier"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr "Afficher tout les formats"
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Dimensions :"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Largeur :"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 msgid "Width of the paper that you wish to print to"
 msgstr "Largeur du papier sur lequel vous souhaitez imprimer"
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Hauteur :"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 msgid "Height of the paper that you wish to print to"
 msgstr "Hauteur du papier sur lequel vous souhaitez imprimer"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 msgid "Automatic Paper Size"
 msgstr "Taille papier automatique"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr "Nombre d'exemplaires"
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 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"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 msgid "Image Position"
 msgstr "Position de l'image"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Paysage"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "Retourné (haut/bas)"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Paysage retourné (haut/bas)"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6243,121 +6447,121 @@ msgstr ""
 "Sélectionnez l'orientation : portrait, paysage, retourné ou paysage retourné "
 "(retourné haut/bas)"
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Orientation :"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Gauche:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Droite:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 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:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Haut:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to the image"
 msgstr "Distance entre le bord supérieur du papier et l'image"
 
-#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Bas :"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Distance entre le bord inférieur du papier et l'image"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "Centrer:"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Horizontal"
 msgstr "Horizontalement"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "Centrer l'image horizontalement sur le papier"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Les deux"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "Centrer l'image sur le papier"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Vertical"
 msgstr "Verticalement"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "Centrer l'image verticalement sur le papier"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Configuration de l'imprimante"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 msgid "Printer Make:"
 msgstr "Marque de l'imprimante :"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 msgid "Select the make of your printer"
 msgstr "Sélectionnez la marque de votre imprimante"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Modèle d'imprimante :"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "Sélectionnez le modèle de votre imprimante"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "Fichier PPD:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Entrez le nom de fichier PPD pour votre imprimante"
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Parcourir"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Choisissez le fichier PPD correct pour votre imprimante"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -6365,52 +6569,52 @@ msgstr ""
 "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:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 msgid "Printer Queue:"
 msgstr "File d'attente:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "Enter the correct command to print to your printer. "
 msgstr "Entrez la commande pour imprimer sur votre imprimante"
 
-#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr "Entrez le nom du fichier."
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 msgid "File to print to"
 msgstr "fichier d'impression"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 msgid "Print To File"
 msgstr "Imprimer dans un fichier ?"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "Définir une nouvelle imprimante"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "Nom de l'imprimante :"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Saisissez le nom que vous voulez donner à cette imprimante logique"
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 msgid "About Gutenprint "
 msgstr "À propos de Gutenprint"
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 msgid "Gutenprint Version "
 msgstr "Version de Gutenprint"
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Paramètres de l'imprimante"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6418,11 +6622,11 @@ msgstr ""
 "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:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "Configurer l'imprimante..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6430,11 +6634,11 @@ msgstr ""
 "Indiquez le modèle d'imprimante, le fichier PPD et la commande nécessaire "
 "pour l'impression sur cette imprimante"
 
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "Nouvelle imprimante..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6442,23 +6646,32 @@ 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."
 
-#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Valeurs par défaut"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 msgid "Image Size"
 msgstr "Taille de l'image"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Échelle:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "Régler l'échelle (taille) de l'image"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr "Mise à l'échelle en "
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6466,31 +6679,31 @@ msgstr ""
 "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:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Pourcentage"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "Dimensionne l'impression par rapport à la taille de la page"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "points par pouce"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 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:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "Défini la largeur de l'impression"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "Défini la hauteur de l'impression"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6498,66 +6711,66 @@ msgstr ""
 "Utiliser la taille \n"
 "de l'image originale"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 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:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "Ajustement des couleurs d'impression"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Valeurs par défaut"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Aperçu de l'image"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr "Visualisation canaux de sortie"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 msgid "Output"
 msgstr "Sortie"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Type de sortie:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "Sélectionnez le type de sortie désiré"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "Réglages fins..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Ajustement de la balance des couleurs, luminosité, contraste, saturation et "
 "algorithme de tramage"
 
-#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 msgid "Size Units:"
 msgstr "Unités de taille:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Unités:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "Sélectionne l'unité de base de mesure pour l'impression"
 
@@ -6590,11 +6803,11 @@ msgstr "Berkeley lpd (/usr/libexec/lpc)"
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 msgid "Printer"
 msgstr "Imprimante"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 msgid "(Default Printer)"
 msgstr "(imprimante par défaut)"
 
@@ -6642,85 +6855,85 @@ msgstr "Valeur maximum possible pour Y"
 msgid "_Gamma value"
 msgstr "Valeur gamma"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 msgid "Printer Features"
 msgstr "Caractéristiques de l'imprimante"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 msgid "Output Control"
 msgstr "contrôle de sortie"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 msgid "Common"
 msgstr "Commun"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 msgid "Extra 1"
-msgstr "Extra 1"
+msgstr "Extra1"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 msgid "Extra 2"
-msgstr "Extra 2"
+msgstr "Extra2"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 msgid "Extra 3"
-msgstr "Extra 3"
+msgstr "Extra3"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 msgid "Extra 4"
-msgstr "Extra 4"
+msgstr "Extra4"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 msgid "Extra 5"
-msgstr "Extra 5"
+msgstr "Extra5"
 
 #. 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "French"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "Impression double face"
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr "Non"
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr "Oui"
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 #, fuzzy
 msgid "Value"
 msgstr "Bleu"
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr "Réglage fin"
 
@@ -6767,6 +6980,7 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
 #: src/escputil/escputil.c:119
+#, fuzzy
 msgid ""
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
@@ -6802,12 +7016,12 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
@@ -6865,7 +7079,7 @@ msgstr ""
 "   -C|--choices       Nombre de choix de motifs pour l'alignement\n"
 "   -p|--patterns      Numéro des jeux de motifs pour l'alignment\n"
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -6949,88 +7163,93 @@ msgstr ""
 "    -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
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, 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"
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Vous ne pouvez spécifier qu'un modèle d'imprimante"
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr "Le choix de l'alignement doit être au moins 1."
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr "Le nombre de passes d'alignement doit être au moins de 1."
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Option inconnue %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr "Usage: %s [OPTIONS] command\n"
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr "Tapez `%s --help' pour plus d'information.\n"
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr "Tapez  `%s -h' pour plus d'information.\n"
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Impossible d'ouvrir le périphérique %s : %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Impossible d'imprimer sur l'imprimante %s avec %s\n"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Impossible d'envoyer la commande à l'imprimante\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr "Lecture données de l'imprimante: temps excédé\n"
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Impossible de lire à partir de %s : %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Impossible d'ouvrir %s en lecture/écriture : %s\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Option inconnue %c\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %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
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7039,7 +7258,7 @@ msgstr ""
 "\n"
 "Impossible d'écrire sur %s : %s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7050,220 +7269,218 @@ msgstr ""
 "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
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr "Etat: Erreur\n"
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Etat: auto-impression\n"
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Etat: occupé\n"
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Etat: Attente\n"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Etat: Libre\n"
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Etat: Pause\n"
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Etat: Nettoyage\n"
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "Etat: Configuration usine\n"
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Etat: Arrêt en cours\n"
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Etat: Inconnu (%d)\n"
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Erreur: Erreur fatale\n"
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Erreur: une autre interface est sélectionnée\n"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Erreur: ouvercle ouvert\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Erreur: Bourrage papier\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Erreur: plus d'encre\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Erreur: Pas de papier\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Erreur: Attente retour à la position de repos\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Erreur: double chargement\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr "Erreur: Erreur massicot non récupérable\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr "Erreur: bourrage massicot (récupérable)\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr "Erreur: Support CD sorti\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Erreur: Chargement de la carte\n"
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr "Erreur: couvercle du support ouvert\n"
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Error: Inconnue (%d)\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Impression autotest des buses\n"
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Niveau d'encres:\n"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 msgstr "Encre couleur"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "Pourcentage restant"
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr "Attention: Encre noire niveau bas\n"
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Attention: Inconnu (%d)\n"
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr "Nom du travail: "
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr "niveau d'encres"
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr "état"
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, 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 "
 "device).\n"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, 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"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr "Numéro de pièce"
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr "Date"
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, 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"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Ne paut pas identifier le modèle d'imprimante.\n"
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Nettoyage des têtes...\n"
@@ -7441,7 +7658,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Impossible d'envoyer la commande à l'imprimante, abandon.\n"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr "uitte.\n"
@@ -7468,7 +7685,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7559,9 +7776,9 @@ msgid "Final command was not confirmed.\n"
 msgstr "La dernière commande n'a pas été confirmée.\n"
 
 #: src/escputil/escputil.c:1908
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7575,12 +7792,12 @@ msgstr ""
 "S'il vous plait placez une feuillle de papier dans votre imprimante\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
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "Pressez Entrée pour continuer > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7591,42 +7808,42 @@ msgstr ""
 "lignes dans chaque trame.\n"
 "Tapez un nombre de paire, '?' pourl'aide ou 'r' pour répéter l'opération.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "Passe #%d"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Veuillez insérer une feuille de papier vierge.\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Nombre hors-intervalle !\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Je ne comprends pas ce que vous avez tapé !\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, 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"
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Tentative de réglage de l'alignement..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "Succès.\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7639,7 +7856,7 @@ msgstr ""
 "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"
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "Erreur en entrée\n"
diff --git a/po/gutenprint.pot b/po/gutenprint.pot
index 6dc42f6..2b060b8 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: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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:1737
+#: src/main/print-escp2.c:1752
 msgid "Default"
 msgstr ""
 
@@ -78,16 +78,16 @@ msgstr ""
 msgid "Density"
 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -136,26 +136,26 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr ""
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -163,268 +163,269 @@ msgstr ""
 msgid "Basic Printer Setup"
 msgstr ""
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: 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: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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr ""
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr ""
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr ""
 
-#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr ""
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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:252 src/main/print-escp2.c:238
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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:265 src/main/print-escp2.c:335
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 msgid "Cyan Density"
 msgstr ""
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 msgid "Magenta Density"
 msgstr ""
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 msgid "Yellow Density"
 msgstr ""
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 msgid "Black Density"
 msgstr ""
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr ""
 
-#: 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-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 msgid "Light Cyan Transition"
 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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 msgid "CD - Custom"
 msgstr ""
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 msgid "Print To Hub"
 msgstr ""
 
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr ""
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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"
@@ -462,9 +463,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr ""
 
@@ -544,7 +545,7 @@ msgid "Output image type"
 msgstr ""
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr ""
 
@@ -602,15 +603,16 @@ msgstr ""
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr ""
 
@@ -618,15 +620,16 @@ msgstr ""
 msgid "Adjust the cyan gamma"
 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr ""
 
@@ -634,15 +637,16 @@ msgstr ""
 msgid "Adjust the magenta gamma"
 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr ""
 
@@ -650,10 +654,10 @@ msgstr ""
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr ""
 
@@ -661,8 +665,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr ""
 
@@ -670,10 +674,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr ""
 
@@ -682,14 +686,16 @@ 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr ""
 
@@ -697,7 +703,7 @@ msgstr ""
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr ""
 
@@ -710,7 +716,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 msgid "Magenta Balance"
 msgstr ""
 
@@ -718,7 +724,7 @@ msgstr ""
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 msgid "Yellow Balance"
 msgstr ""
 
@@ -742,9 +748,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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 msgid "Advanced Output Control"
 msgstr ""
 
@@ -893,350 +899,361 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr ""
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:761
+#: src/main/printers.c:772
 msgid "Page size is not valid\n"
 msgstr ""
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:788
+#: src/main/printers.c:799
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:794
+#: src/main/printers.c:805
 msgid "Height must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 msgid "Width must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, 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:813
+#: src/main/printers.c:824
 #, 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr ""
 
-#: src/main/print-escp2.c:228
+#: src/main/print-escp2.c:229
 msgid "Resolution of the print"
 msgstr ""
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 msgid "Ink Set"
 msgstr ""
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 msgid "Output Order"
 msgstr ""
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 msgid "Ink change command"
 msgstr ""
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 msgid "Alternate Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 msgid "Channel Names"
 msgstr ""
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 msgid "Cyan Map"
 msgstr ""
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 msgid "Magenta Map"
 msgstr ""
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 msgid "Yellow Map"
 msgstr ""
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 msgid "Blue Map"
 msgstr ""
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr ""
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr ""
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr ""
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 msgid "Automatic"
 msgstr ""
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1290,128 +1307,129 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: 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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr ""
 
@@ -1427,50 +1445,50 @@ msgstr ""
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -1582,8 +1600,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr ""
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 msgid "PPD File"
 msgstr ""
 
@@ -1591,264 +1609,270 @@ msgstr ""
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 msgid "Three Level Grayscale"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr ""
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 msgid "Eight Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 msgid "Two Color Raw"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 msgid "Five Color Raw"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 msgid "Eight Color Raw"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 msgid "UltraChrome Photo Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 msgid "Light Magenta"
 msgstr ""
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 msgid "Light Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 msgid "Dark Yellow"
 msgstr ""
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr ""
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 msgid "Matte Paper Heavyweight"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 msgid "ColorLife Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 msgid "Archival Matte Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 msgid "Print to CD"
 msgstr ""
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 msgid "Manual Sheet Guide"
 msgstr ""
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 msgid "Manual Feed (Front)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 msgid "Rear Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 msgid "Photo Board"
 msgstr ""
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr ""
 
@@ -2709,3335 +2733,3479 @@ msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon BJC-6000"
+msgid "Canon BJC-5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon BJC-6100"
+msgid "Canon BJC-5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon BJC-6200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon BJC-6500"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon BJC-7000"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "Canon BJC-7100"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "Canon BJC-8200"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "Canon S100"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "Canon S200"
+msgid "Canon BJC-8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "Canon S300"
+msgid "Canon BJC-8500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "Canon S400"
+msgid "Canon S100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "Canon S450"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "Canon S500"
+msgid "Canon S300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "Canon S600"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "Canon S630"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "Canon S800"
+msgid "Canon S500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "Canon S4500"
+msgid "Canon S600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "Canon PIXMA iP2000"
+msgid "Canon S630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "Canon PIXMA iP3000"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "Canon PIXMA iP3100"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "Canon PIXMA iP4000"
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "Canon PIXMA iP4100"
+msgid "Canon PIXMA iP3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "Canon PIXMA iP4200"
+msgid "Canon PIXMA iP3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
-msgid "Canon PIXMA iP4300"
+msgid "Canon PIXMA iP4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:188
-msgid "Canon PIXMA iP5000"
+msgid "Canon PIXMA iP4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:189
-msgid "Canon PIXMA iP5200"
+msgid "Canon PIXMA iP4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:190
-msgid "Canon PIXMA iP6700"
+msgid "Canon PIXMA iP4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:191
-msgid "Canon PIXMA MP150"
+msgid "Canon PIXMA iP4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:192
-msgid "Canon PIXMA MP500"
+msgid "Canon PIXMA iP5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:193
-msgid "Canon PIXMA MP700"
+msgid "Canon PIXMA iP5200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:194
-msgid "Canon PIXMA MP730"
+msgid "Canon PIXMA iP5300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:195
-msgid "Canon PIXMA MP750"
+msgid "Canon PIXMA iP6700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:196
-msgid "Canon PIXMA MP760"
+msgid "Canon PIXMA iP8500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:197
-msgid "Canon PIXMA MP770"
+msgid "Canon PIXMA iX5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:198
-msgid "Canon PIXMA MP780"
+msgid "Canon PIXMA Pro9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:199
-msgid "Canon PIXMA MP790"
+msgid "Canon PIXMA MP150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:200
-msgid "Canon PIXMA MP830"
+msgid "Canon PIXMA MP170"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:201
-msgid "Canon PIXUS iP3100"
+msgid "Canon PIXMA MP180"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:202
-msgid "Canon PIXUS iP4100"
+msgid "Canon PIXMA MP500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:203
-msgid "Canon i560"
+msgid "Canon PIXMA MP610"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:204
-msgid "Canon i850"
+msgid "Canon PIXMA MP700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:205
-msgid "Canon i860"
+msgid "Canon PIXMA MP710"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:206
-msgid "Canon i865"
+msgid "Canon PIXMA MP730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:207
-msgid "Epson Stylus C20"
+msgid "Canon PIXMA MP740"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:208
-msgid "Epson Stylus C20SX"
+msgid "Canon PIXMA MP750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:209
-msgid "Epson Stylus C20UX"
+msgid "Canon PIXMA MP760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:210
-msgid "Epson Stylus C40"
+msgid "Canon PIXMA MP770"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:211
-msgid "Epson Stylus C40SX"
+msgid "Canon PIXMA MP780"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:212
-msgid "Epson Stylus C40UX"
+msgid "Canon PIXMA MP790"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:213
-msgid "Epson Stylus C41"
+msgid "Canon PIXMA MP830"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:214
-msgid "Epson Stylus C41SX"
+msgid "Canon PIXUS iP3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:215
-msgid "Epson Stylus C41UX"
+msgid "Canon PIXUS iP4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:216
-msgid "Epson Stylus C42"
+msgid "Canon i80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:217
-msgid "Epson Stylus C42SX"
+msgid "Canon i560"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:218
-msgid "Epson Stylus C42UX"
+msgid "Canon i850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:219
-msgid "Epson Stylus C43"
+msgid "Canon i860"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:220
-msgid "Epson Stylus C43SX"
+msgid "Canon i865"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:221
-msgid "Epson Stylus C43UX"
+msgid "Epson Stylus C20"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:222
-msgid "Epson Stylus C44"
+msgid "Epson Stylus C20SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:223
-msgid "Epson Stylus C44SX"
+msgid "Epson Stylus C20UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:224
-msgid "Epson Stylus C44UX"
+msgid "Epson Stylus C40"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:225
-msgid "Epson Stylus C45"
+msgid "Epson Stylus C40SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:226
-msgid "Epson Stylus C46"
+msgid "Epson Stylus C40UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:227
-msgid "Epson Stylus C48"
+msgid "Epson Stylus C41"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:228
-msgid "Epson Stylus C50"
+msgid "Epson Stylus C41SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:229
-msgid "Epson Stylus C60"
+msgid "Epson Stylus C41UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:230
-msgid "Epson Stylus C61"
+msgid "Epson Stylus C42"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:231
-msgid "Epson Stylus C62"
+msgid "Epson Stylus C42SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:232
-msgid "Epson Stylus C63"
+msgid "Epson Stylus C42UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:233
-msgid "Epson Stylus C64"
+msgid "Epson Stylus C43"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:234
-msgid "Epson Stylus C65"
+msgid "Epson Stylus C43SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:235
-msgid "Epson Stylus C66"
+msgid "Epson Stylus C43UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:236
-msgid "Epson Stylus C68"
+msgid "Epson Stylus C44"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:237
-msgid "Epson Stylus C70"
+msgid "Epson Stylus C44SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:238
-msgid "Epson Stylus C79"
+msgid "Epson Stylus C44UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:239
-msgid "Epson Stylus C80"
+msgid "Epson Stylus C45"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:240
-msgid "Epson Stylus C82"
+msgid "Epson Stylus C46"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:241
-msgid "Epson Stylus C83"
+msgid "Epson Stylus C48"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:242
-msgid "Epson Stylus C84"
+msgid "Epson Stylus C50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:243
-msgid "Epson Stylus C85"
+msgid "Epson Stylus C60"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:244
-msgid "Epson Stylus C86"
+msgid "Epson Stylus C61"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:245
-msgid "Epson Stylus C87"
+msgid "Epson Stylus C62"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:246
-msgid "Epson Stylus C88"
+msgid "Epson Stylus C63"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:247
-msgid "Epson Stylus Color"
+msgid "Epson Stylus C64"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:248
-msgid "Epson Stylus Color I"
+msgid "Epson Stylus C65"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:249
-msgid "Epson Stylus Color II"
+msgid "Epson Stylus C66"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:250
-msgid "Epson Stylus Color IIs"
+msgid "Epson Stylus C68"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:251
-msgid "Epson Stylus Color PRO"
+msgid "Epson Stylus C70"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:252
-msgid "Epson Stylus Pro XL"
+msgid "Epson Stylus C79"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:253
-msgid "Epson Stylus Color 400"
+msgid "Epson Stylus C80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:254
-msgid "Epson Stylus Color 440"
+msgid "Epson Stylus C82"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:255
-msgid "Epson Stylus Color 460"
+msgid "Epson Stylus C83"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:256
-msgid "Epson Stylus Color 480"
+msgid "Epson Stylus C84"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:257
-msgid "Epson Stylus Color 500"
+msgid "Epson Stylus C85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:258
-msgid "Epson Stylus Color 580"
+msgid "Epson Stylus C86"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:259
-msgid "Epson Stylus Color 600"
+msgid "Epson Stylus C87"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:260
-msgid "Epson Stylus Color 640"
+msgid "Epson Stylus C88"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:261
-msgid "Epson Stylus Color 660"
+msgid "Epson Stylus C110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:262
-msgid "Epson Stylus Color 670"
+msgid "Epson Stylus C120"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:263
-msgid "Epson Stylus Color 680"
+msgid "Epson Stylus Color"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:264
-msgid "Epson Stylus Color 740"
+msgid "Epson Stylus Color I"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:265
-msgid "Epson Stylus Color 760"
+msgid "Epson Stylus Color II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:266
-msgid "Epson Stylus Color 777"
+msgid "Epson Stylus Color IIs"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:267
-msgid "Epson Stylus Color 800"
+msgid "Epson Stylus Color PRO"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:268
-msgid "Epson Stylus Color 850"
+msgid "Epson Stylus Pro XL"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:269
-msgid "Epson Stylus Color 860"
+msgid "Epson Stylus Color 400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:270
-msgid "Epson Stylus Color 880"
+msgid "Epson Stylus Color 440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:271
-msgid "Epson Stylus Color 8 3"
+msgid "Epson Stylus Color 460"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:272
-msgid "Epson Stylus Color 900"
+msgid "Epson Stylus Color 480"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:273
-msgid "Epson Stylus Color 980"
+msgid "Epson Stylus Color 500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:274
-msgid "Epson Stylus Color 1160"
+msgid "Epson Stylus Color 580"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:275
-msgid "Epson Stylus Color 1500"
+msgid "Epson Stylus Color 600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:276
-msgid "Epson Stylus Color 1520"
+msgid "Epson Stylus Color 640"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:277
-msgid "Epson Stylus Color 3000"
+msgid "Epson Stylus Color 660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:278
-msgid "Epson Stylus Photo"
+msgid "Epson Stylus Color 670"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:279
-msgid "Epson Stylus Photo 700"
+msgid "Epson Stylus Color 680"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:280
-msgid "Epson Stylus Photo EX"
+msgid "Epson Stylus Color 740"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:281
-msgid "Epson Stylus Photo EX3"
+msgid "Epson Stylus Color 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:282
-msgid "Epson Stylus Photo 720"
+msgid "Epson Stylus Color 777"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:283
-msgid "Epson Stylus Photo 750"
+msgid "Epson Stylus Color 800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:284
-msgid "Epson Stylus Photo 780"
+msgid "Epson Stylus Color 850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:285
-msgid "Epson Stylus Photo 785"
+msgid "Epson Stylus Color 860"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:286
-msgid "Epson Stylus Photo 790"
+msgid "Epson Stylus Color 880"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:287
-msgid "Epson Stylus Photo 810"
+msgid "Epson Stylus Color 8 3"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:288
-msgid "Epson Stylus Photo 820"
+msgid "Epson Stylus Color 900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:289
-msgid "Epson Stylus Photo 825"
+msgid "Epson Stylus Color 980"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:290
-msgid "Epson Stylus Photo 830"
+msgid "Epson Stylus Color 1160"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:291
-msgid "Epson Stylus Photo 830U"
+msgid "Epson Stylus Color 1500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:292
-msgid "Epson Stylus Photo 870"
+msgid "Epson Stylus Color 1520"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:293
-msgid "Epson Stylus Photo 875"
+msgid "Epson Stylus Color 3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:294
-msgid "Epson Stylus Photo 890"
+msgid "Epson Stylus Photo"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:295
-msgid "Epson Stylus Photo 895"
+msgid "Epson Stylus Photo 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:296
-msgid "Epson Stylus Photo 900"
+msgid "Epson Stylus Photo EX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:297
-msgid "Epson Stylus Photo 915"
+msgid "Epson Stylus Photo EX3"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:298
-msgid "Epson Stylus Photo 925"
+msgid "Epson Stylus Photo 720"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:299
-msgid "Epson Stylus Photo 935"
+msgid "Epson Stylus Photo 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:300
-msgid "Epson Stylus Photo 950"
+msgid "Epson Stylus Photo 780"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:301
-msgid "Epson Stylus Photo 960"
+msgid "Epson Stylus Photo 785"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:302
-msgid "Epson Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:303
-msgid "Epson Stylus Photo 1270"
+msgid "Epson Stylus Photo 810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:304
-msgid "Epson Stylus Photo 1280"
+msgid "Epson Stylus Photo 820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:305
-msgid "Epson Stylus Photo 1290"
+msgid "Epson Stylus Photo 825"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:306
-msgid "Epson Stylus Photo 1400"
+msgid "Epson Stylus Photo 830"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:307
-msgid "Epson Stylus Photo 1410"
+msgid "Epson Stylus Photo 830U"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:308
-msgid "Epson Stylus Photo 2000P"
+msgid "Epson Stylus Photo 870"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:309
-msgid "Epson Stylus Photo 2100"
+msgid "Epson Stylus Photo 875"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:310
-msgid "Epson Stylus Photo 2200"
+msgid "Epson Stylus Photo 890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:311
-msgid "Epson Stylus Photo R200"
+msgid "Epson Stylus Photo 895"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:312
-msgid "Epson Stylus Photo R210"
+msgid "Epson Stylus Photo 900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:313
-msgid "Epson Stylus Photo R220"
+msgid "Epson Stylus Photo 915"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:314
-msgid "Epson Stylus Photo R230"
+msgid "Epson Stylus Photo 925"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:315
-msgid "Epson Stylus Photo R240"
+msgid "Epson Stylus Photo 935"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:316
-msgid "Epson Stylus Photo R245"
+msgid "Epson Stylus Photo 950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:317
-msgid "Epson Stylus Photo R260"
+msgid "Epson Stylus Photo 960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:318
-msgid "Epson Stylus Photo R265"
+msgid "Epson Stylus Photo 1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:319
-msgid "Epson Stylus Photo R270"
+msgid "Epson Stylus Photo 1270"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:320
-msgid "Epson Stylus Photo R300"
+msgid "Epson Stylus Photo 1280"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:321
-msgid "Epson Stylus Photo R310"
+msgid "Epson Stylus Photo 1290"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:322
-msgid "Epson Stylus Photo R320"
+msgid "Epson Stylus Photo 1400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:323
-msgid "Epson Stylus Photo R340"
+msgid "Epson Stylus Photo 1410"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:324
-msgid "Epson Stylus Photo R350"
+msgid "Epson Stylus Photo 2000P"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:325
-msgid "Epson Stylus Photo R360"
+msgid "Epson Stylus Photo 2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:326
-msgid "Epson Stylus Photo R380"
+msgid "Epson Stylus Photo 2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:327
-msgid "Epson Stylus Photo R390"
+msgid "Epson Stylus Photo R200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:328
-msgid "Epson Stylus Photo RX400"
+msgid "Epson Stylus Photo R210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:329
-msgid "Epson Stylus Photo RX420"
+msgid "Epson Stylus Photo R220"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:330
-msgid "Epson Stylus Photo RX425"
+msgid "Epson Stylus Photo R230"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:331
-msgid "Epson Stylus Photo RX430"
+msgid "Epson Stylus Photo R240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:332
-msgid "Epson Stylus Photo RX500"
+msgid "Epson Stylus Photo R245"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:333
-msgid "Epson Stylus Photo RX510"
+msgid "Epson Stylus Photo R260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:334
-msgid "Epson Stylus Photo RX560"
+msgid "Epson Stylus Photo R265"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:335
-msgid "Epson Stylus Photo RX580"
+msgid "Epson Stylus Photo R270"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:336
-msgid "Epson Stylus Photo RX590"
+msgid "Epson Stylus Photo R300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:337
-msgid "Epson Stylus Photo RX600"
+msgid "Epson Stylus Photo R310"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:338
-msgid "Epson Stylus Photo RX620"
+msgid "Epson Stylus Photo R320"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:339
-msgid "Epson Stylus Photo RX630"
+msgid "Epson Stylus Photo R340"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:340
-msgid "Epson Stylus Photo RX640"
+msgid "Epson Stylus Photo R350"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:341
-msgid "Epson Stylus Photo RX700"
+msgid "Epson Stylus Photo R360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:342
-msgid "Epson Stylus Photo R800"
+msgid "Epson Stylus Photo R380"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:343
-msgid "Epson Stylus Photo R1800"
+msgid "Epson Stylus Photo R390"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:344
-msgid "Epson Stylus Photo R2400"
+msgid "Epson Stylus Photo RX400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:345
-msgid "Epson Stylus Pro 5000"
+msgid "Epson Stylus Photo RX420"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:346
-msgid "Epson Stylus Pro 5500"
+msgid "Epson Stylus Photo RX425"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:347
-msgid "Epson Stylus Pro 7000"
+msgid "Epson Stylus Photo RX430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:348
-msgid "Epson Stylus Pro 7500"
+msgid "Epson Stylus Photo RX500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:349
-msgid "Epson Stylus Pro 7600"
+msgid "Epson Stylus Photo RX510"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "Epson Stylus Pro 9000"
+msgid "Epson Stylus Photo RX560"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "Epson Stylus Pro 9500"
+msgid "Epson Stylus Photo RX580"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "Epson Stylus Pro 9600"
+msgid "Epson Stylus Photo RX590"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "Epson Stylus Pro 10000"
+msgid "Epson Stylus Photo RX595"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "Epson Stylus Scan 2000"
+msgid "Epson Stylus Photo RX600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "Epson Stylus Scan 2500"
+msgid "Epson Stylus Photo RX620"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "Epson Stylus CX1500"
+msgid "Epson Stylus Photo RX630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "Epson Stylus CX3100"
+msgid "Epson Stylus Photo RX640"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "Epson Stylus CX3200"
+msgid "Epson Stylus Photo RX700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "Epson Stylus CX3500"
+msgid "Epson Stylus Photo R800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "Epson Stylus CX3600"
+msgid "Epson Stylus Photo R1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "Epson Stylus CX3650"
+msgid "Epson Stylus Photo R2400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "Epson Stylus CX3700"
+msgid "Epson Stylus Pro 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "Epson Stylus CX3800"
+msgid "Epson Stylus Pro 5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "Epson Stylus CX3805"
+msgid "Epson Stylus Pro 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "Epson Stylus CX3810"
+msgid "Epson Stylus Pro 7500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "Epson Stylus CX4100"
+msgid "Epson Stylus Pro 7600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "Epson Stylus CX4200"
+msgid "Epson Stylus Pro 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "Epson Stylus CX4500"
+msgid "Epson Stylus Pro 9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "Epson Stylus CX4600"
+msgid "Epson Stylus Pro 9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "Epson Stylus CX4700"
+msgid "Epson Stylus Pro 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "Epson Stylus CX4800"
+msgid "Epson Stylus Scan 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "Epson Stylus CX5000"
+msgid "Epson Stylus Scan 2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "Epson Stylus CX5000F"
+msgid "Epson Stylus CX1500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "Epson Stylus CX5100"
+msgid "Epson Stylus CX3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "Epson Stylus CX5200"
+msgid "Epson Stylus CX3200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "Epson Stylus CX5300"
+msgid "Epson Stylus CX3500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "Epson Stylus CX5400"
+msgid "Epson Stylus CX3600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-msgid "Epson Stylus CX5700"
+msgid "Epson Stylus CX3650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-msgid "Epson Stylus CX5800"
+msgid "Epson Stylus CX3700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-msgid "Epson Stylus CX6000"
+msgid "Epson Stylus CX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-msgid "Epson Stylus CX6300"
+msgid "Epson Stylus CX3805"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-msgid "Epson Stylus CX6400"
+msgid "Epson Stylus CX3810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-msgid "Epson Stylus CX6500"
+msgid "Epson Stylus CX4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-msgid "Epson Stylus CX6600"
+msgid "Epson Stylus CX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-msgid "Epson Stylus CX7000F"
+msgid "Epson Stylus CX4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-msgid "Epson Stylus CX7700"
+msgid "Epson Stylus CX4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-msgid "Epson Stylus CX7800"
+msgid "Epson Stylus CX4600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-msgid "Epson Stylus CX8300"
+msgid "Epson Stylus CX4700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-msgid "Epson Stylus CX8400"
+msgid "Epson Stylus CX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-msgid "Epson Stylus D68"
+msgid "Epson Stylus CX4900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-msgid "Epson Stylus D88"
+msgid "Epson Stylus CX5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-msgid "Epson Stylus DX3800"
+msgid "Epson Stylus CX5000F"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "Epson Stylus DX3850"
+msgid "Epson Stylus CX5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "Epson Stylus DX4200"
+msgid "Epson Stylus CX5200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "Epson Stylus DX4250"
+msgid "Epson Stylus CX5300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Epson Stylus DX4800"
+msgid "Epson Stylus CX5400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Epson PictureMate"
+msgid "Epson Stylus CX5600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "Epson PictureMate Deluxe"
+msgid "Epson Stylus CX5700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "Epson PictureMate Flash"
+msgid "Epson Stylus CX5800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:400
-msgid "Epson PictureMate Pal"
+msgid "Epson Stylus CX6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "Epson PictureMate Snap"
+msgid "Epson Stylus CX6300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "Epson PictureMate 200"
+msgid "Epson Stylus CX6400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:403
-msgid "Epson PictureMate 210"
+msgid "Epson Stylus CX6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:404
-msgid "Epson PictureMate 240"
+msgid "Epson Stylus CX6600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "Epson PictureMate 250"
+msgid "Epson Stylus CX7000F"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:406
-msgid "Epson PictureMate 280"
+msgid "Epson Stylus CX7400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:407
-msgid "Epson CL 700"
+msgid "Epson Stylus CX7700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:408
-msgid "Epson CL 750"
+msgid "Epson Stylus CX7800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "Epson CL 760"
+msgid "Epson Stylus CX8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:410
-msgid "Epson E 100"
+msgid "Epson Stylus CX8400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:411
-msgid "Epson E 150"
+msgid "Epson Stylus CX9400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:412
-msgid "Epson E 200"
+msgid "Epson Stylus D68"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:413
-msgid "Epson EM 900C"
+msgid "Epson Stylus D88"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:414
-msgid "Epson EM 930C"
+msgid "Epson Stylus D120"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:415
-msgid "Epson MC 2000"
+msgid "Epson Stylus DX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:416
-msgid "Epson MC 5000"
+msgid "Epson Stylus DX3850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:417
-msgid "Epson MC 7000"
+msgid "Epson Stylus DX4050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "Epson MC 9000"
+msgid "Epson Stylus DX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:419
-msgid "Epson MC 10000"
+msgid "Epson Stylus DX4250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "Epson MJ 930C"
+msgid "Epson Stylus DX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "Epson MJ 5100C"
+msgid "Epson PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "Epson MJ 6000C"
+msgid "Epson PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "Epson MJ 8000C"
+msgid "Epson PictureMate Flash"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "Epson PM 700C"
+msgid "Epson PictureMate Pal"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "Epson PM 730C"
+msgid "Epson PictureMate Snap"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "Epson PM 740C"
+msgid "Epson PictureMate 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "Epson PM 750C"
+msgid "Epson PictureMate 210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "Epson PM 760C"
+msgid "Epson PictureMate 240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "Epson PM 770C"
+msgid "Epson PictureMate 250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "Epson PM 780C"
+msgid "Epson PictureMate 280"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "Epson PM 790PT"
+msgid "Epson CL 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "Epson PM 800C"
+msgid "Epson CL 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "Epson PM 850PT"
+msgid "Epson CL 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "Epson PM 870C"
+msgid "Epson E 100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "Epson PM 880C"
+msgid "Epson E 150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "Epson PM 930C"
+msgid "Epson E 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "Epson PM 940C"
+msgid "Epson EM 900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "Epson PM 950C"
+msgid "Epson EM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "Epson PM 970C"
+msgid "Epson MC 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "Epson PM 980C"
+msgid "Epson MC 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "Epson PM 2000C"
+msgid "Epson MC 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "Epson PM 2200C"
+msgid "Epson MC 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "Epson PM 3000C"
+msgid "Epson MC 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "Epson PM 3300C"
+msgid "Epson MJ 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "Epson PM 3500C"
+msgid "Epson MJ 5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "Epson PM 3700C"
+msgid "Epson MJ 6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "Epson PM 4000PX"
+msgid "Epson MJ 8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "Epson PM 5000C"
+msgid "Epson PM 670C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Epson PM 7000C"
+msgid "Epson PM 700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Epson PM 9000C"
+msgid "Epson PM 730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Epson PM 10000"
+msgid "Epson PM 740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Epson PM A650"
+msgid "Epson PM 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Epson PM A750"
+msgid "Epson PM 760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "Epson PM A820"
+msgid "Epson PM 770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
-msgid "Epson PM A890"
+msgid "Epson PM 780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:456
-msgid "Epson PM A900"
+msgid "Epson PM 790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:457
-msgid "Epson PM A950"
+msgid "Epson PM 800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:458
-msgid "Epson PM D600"
+msgid "Epson PM 850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:459
-msgid "Epson PM D750"
+msgid "Epson PM 870C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:460
-msgid "Epson PM D770"
+msgid "Epson PM 880C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:461
-msgid "Epson PM D800"
+msgid "Epson PM 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:462
-msgid "Epson PM D870"
+msgid "Epson PM 940C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:463
-msgid "Epson PM D1000"
+msgid "Epson PM 950C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:464
-msgid "Epson PM G700"
+msgid "Epson PM 970C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:465
-msgid "Epson PM G720"
+msgid "Epson PM 980C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:466
-msgid "Epson PM G730"
+msgid "Epson PM 2000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:467
-msgid "Epson PM G800"
+msgid "Epson PM 2200C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:468
-msgid "Epson PM G820"
+msgid "Epson PM 3000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:469
-msgid "Epson PM G850"
+msgid "Epson PM 3300C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:470
-msgid "Epson PM G4500"
+msgid "Epson PM 3500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:471
-msgid "Epson PX A650"
+msgid "Epson PM 3700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:472
-msgid "Epson PX G900"
+msgid "Epson PM 4000PX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:473
-msgid "Epson PX G920"
+msgid "Epson PM 5000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:474
-msgid "Epson PX G5000"
+msgid "Epson PM 7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:475
-msgid "Epson PX V500"
+msgid "Epson PM 9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:476
-msgid "Epson PX V600"
+msgid "Epson PM 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:477
-msgid "Epson PX V630"
+msgid "Epson PM A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:478
-msgid "Epson PX 5500"
+msgid "Epson PM A750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:479
-msgid "Epson PX 7000"
+msgid "Epson PM A820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:480
-msgid "Epson PX 9000"
+msgid "Epson PM A890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:481
-msgid "Apollo P-2100"
+msgid "Epson PM A900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:482
-msgid "Apollo P-2150"
+msgid "Epson PM A950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:483
-msgid "Apollo P-2200"
+msgid "Epson PM D600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:484
-msgid "Apollo P-2250"
+msgid "Epson PM D750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:485
-msgid "Apollo P-2500"
+msgid "Epson PM D770"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:486
-msgid "Apollo P-2550"
+msgid "Epson PM D800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:487
-msgid "Apollo P-2600"
+msgid "Epson PM D870"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:488
-msgid "Apollo P-2650"
+msgid "Epson PM D1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:489
-msgid "Apple Color StyleWriter 4100"
+msgid "Epson PM G700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:490
-msgid "Apple Color StyleWriter 4500"
+msgid "Epson PM G720"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:491
-msgid "Apple Color StyleWriter 6500"
+msgid "Epson PM G730"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:492
-msgid "Apple LaserWriter Select 360"
+msgid "Epson PM G800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:493
-msgid "Brother DCP-1200"
+msgid "Epson PM G820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:494
-msgid "Brother HL-4Ve"
+msgid "Epson PM G850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:495
-msgid "Brother HL-10V"
+msgid "Epson PM G4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:496
-msgid "Brother HL-10h"
+msgid "Epson PX A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:497
-msgid "Brother HL-630"
+msgid "Epson PX G900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:498
-msgid "Brother HL-660"
+msgid "Epson PX G920"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:499
-msgid "Brother HL-760"
+msgid "Epson PX G5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:500
-msgid "Brother HL-960"
+msgid "Epson PX V500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:501
-msgid "Brother HL-1040"
+msgid "Epson PX V600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:502
-msgid "Brother HL-1050"
+msgid "Epson PX V630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:503
-msgid "Brother HL-1060"
+msgid "Epson PX V780"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:504
-msgid "Brother HL-1070"
+msgid "Epson PX 5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:505
-msgid "Brother HL-1240"
+msgid "Epson PX 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:506
-msgid "Brother HL-1250"
+msgid "Epson PX 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:507
-msgid "Brother HL-1260"
+msgid "Apollo P-2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:508
-msgid "Brother HL-1270N"
+msgid "Apollo P-2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:509
-msgid "Brother HL-1440"
+msgid "Apollo P-2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:510
-msgid "Brother HL-1660e"
+msgid "Apollo P-2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:511
-msgid "Brother HL-2060"
+msgid "Apollo P-2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:512
-msgid "Brother MFC-6550MC"
+msgid "Apollo P-2550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:513
-msgid "Brother MFC-8300"
+msgid "Apollo P-2600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:514
-msgid "Brother MFC-9500"
+msgid "Apollo P-2650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:515
-msgid "Brother MFC-9600"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:516
-msgid "Canon GP 335"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:517
-msgid "Canon LBP-4sx"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:518
-msgid "Canon LBP-430"
+msgid "Apple LaserWriter Select 360"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:519
-msgid "Canon LBP-1000"
+msgid "Brother DCP-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:520
-msgid "Canon LBP-1260"
+msgid "Brother HL-4Ve"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:521
-msgid "Canon LBP-1760"
+msgid "Brother HL-10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:522
-msgid "Canon imageRunner 330s"
+msgid "Brother HL-10h"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:523
-msgid "Citizen ProJet II"
+msgid "Brother HL-630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:524
-msgid "DEC 1800"
+msgid "Brother HL-660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:525
-msgid "DEC LN17"
+msgid "Brother HL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:526
-msgid "Epson ActionLaser 1100"
+msgid "Brother HL-960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:527
-msgid "Epson ActionLaser II"
+msgid "Brother HL-1040"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:528
-msgid "Epson AcuLaser C2000"
+msgid "Brother HL-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:529
-msgid "Epson AcuLaser C2000PS"
+msgid "Brother HL-1060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:530
-msgid "Epson AcuLaser C8500"
+msgid "Brother HL-1070"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:531
-msgid "Epson AcuLaser C8500PS"
+msgid "Brother HL-1240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:532
-msgid "Epson AcuLaser C8600"
+msgid "Brother HL-1250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:533
-msgid "Epson AcuLaser C8600PS"
+msgid "Brother HL-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:534
-msgid "Epson EPL-5200"
+msgid "Brother HL-1270N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:535
-msgid "Epson EPL-5200+"
+msgid "Brother HL-1440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:536
-msgid "Epson EPL-5700"
+msgid "Brother HL-1660e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:537
-msgid "Epson EPL-5700PS"
+msgid "Brother HL-2060"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:538
-msgid "Epson EPL-5800"
+msgid "Brother MFC-6550MC"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:539
-msgid "Epson EPL-5800PS"
+msgid "Brother MFC-8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:540
-msgid "Epson EPL-5900"
+msgid "Brother MFC-9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:541
-msgid "Epson EPL-5900PS"
+msgid "Brother MFC-9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:542
-msgid "Epson EPL-6100"
+msgid "Canon GP 335"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:543
-msgid "Epson EPL-6100PS"
+msgid "Canon LBP-4sx"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:544
-msgid "Epson EPL-7100"
+msgid "Canon LBP-430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:545
-msgid "Fujitsu PrintPartner 10V"
+msgid "Canon LBP-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:546
-msgid "Fujitsu PrintPartner 16DV"
+msgid "Canon LBP-1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:547
-msgid "Fujitsu PrintPartner 20W"
+msgid "Canon LBP-1760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:548
-msgid "Fujitsu PrintPartner 8000"
+msgid "Canon imageRunner 330s"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:549
-msgid "Generic PCL 4 Printer"
+msgid "Citizen ProJet II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:550
-msgid "Generic PCL 5 Printer"
+msgid "DEC 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:551
-msgid "Generic PCL 5c Printer"
+msgid "DEC LN17"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:552
-msgid "Generic PCL 5e Printer"
+msgid "Epson ActionLaser 1100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:553
-msgid "Generic PCL 6/PCL XL Printer"
+msgid "Epson ActionLaser II"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:554
-msgid "HP Business Inkjet 2200"
+msgid "Epson AcuLaser C2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:555
-msgid "HP Business Inkjet 2230"
+msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:556
-msgid "HP Business Inkjet 2250"
+msgid "Epson AcuLaser C8500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:557
-msgid "HP Business Inkjet 2250TN"
+msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:558
-msgid "HP Business Inkjet 2280"
+msgid "Epson AcuLaser C8600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:559
-msgid "HP Color Inkjet Printer CP1160"
+msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:560
-msgid "HP Color Inkjet Printer CP1700"
+msgid "Epson EPL-5200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:561
-msgid "HP Color LaserJet 2500"
+msgid "Epson EPL-5200+"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:562
-msgid "HP Color LaserJet 4500"
+msgid "Epson EPL-5700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:563
-msgid "HP Color LaserJet 4550"
+msgid "Epson EPL-5700PS"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:564
-msgid "HP Color LaserJet 4600"
+msgid "Epson EPL-5800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:565
-msgid "HP Color LaserJet 5"
+msgid "Epson EPL-5800PS"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:566
-msgid "HP Color LaserJet 5000"
+msgid "Epson EPL-5900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:567
-msgid "HP Color LaserJet 5500"
+msgid "Epson EPL-5900PS"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:568
-msgid "HP Color LaserJet 8550GN"
+msgid "Epson EPL-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:569
-msgid "HP DesignJet 230"
+msgid "Epson EPL-6100PS"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:570
-msgid "HP DesignJet 250C"
+msgid "Epson EPL-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:571
-msgid "HP DesignJet 430"
+msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:572
-msgid "HP DesignJet 450C"
+msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:573
-msgid "HP DesignJet 455CA"
+msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:574
-msgid "HP DesignJet 488CA"
+msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:575
-msgid "HP DesignJet 700"
+msgid "Generic PCL 4 Printer"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:576
-msgid "HP DesignJet 750C Plus"
+msgid "Generic PCL 5 Printer"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:577
-msgid "HP DesignJet 750C"
+msgid "Generic PCL 5c Printer"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:578
-msgid "HP DesignJet 2500CP"
+msgid "Generic PCL 5e Printer"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:579
-msgid "HP DesignJet 3500CP"
+msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:580
-msgid "HP DesignJet ColorPro CAD"
+msgid "HP Business Inkjet 2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:581
-msgid "HP DeskJet 400"
+msgid "HP Business Inkjet 2230"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:582
-msgid "HP DeskJet 420C"
+msgid "HP Business Inkjet 2250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:583
-msgid "HP DeskJet 450"
+msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:584
-msgid "HP DeskJet 500"
+msgid "HP Business Inkjet 2280"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:585
-msgid "HP DeskJet 500C"
+msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:586
-msgid "HP DeskJet 505J Plus"
+msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:587
-msgid "HP DeskJet 510"
+msgid "HP Color LaserJet 2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:588
-msgid "HP DeskJet 520"
+msgid "HP Color LaserJet 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:589
-msgid "HP DeskJet 540C"
+msgid "HP Color LaserJet 4550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:590
-msgid "HP DeskJet 550C"
+msgid "HP Color LaserJet 4600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:591
-msgid "HP DeskJet 5550"
+msgid "HP Color LaserJet 5"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:592
-msgid "HP DeskJet 5551"
+msgid "HP Color LaserJet 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:593
-msgid "HP DeskJet 560C"
+msgid "HP Color LaserJet 5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:594
-msgid "HP DeskJet 600"
+msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:595
-msgid "HP DeskJet 600C"
+msgid "HP DesignJet 230"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:596
-msgid "HP DeskJet 610C"
+msgid "HP DesignJet 250C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:597
-msgid "HP DeskJet 610CL"
+msgid "HP DesignJet 430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:598
-msgid "HP DeskJet 6122"
+msgid "HP DesignJet 450C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:599
-msgid "HP DeskJet 6127"
+msgid "HP DesignJet 455CA"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:600
-msgid "HP DeskJet 612C"
+msgid "HP DesignJet 488CA"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:601
-msgid "HP DeskJet 640C"
+msgid "HP DesignJet 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:602
-msgid "HP DeskJet 648C"
+msgid "HP DesignJet 750C Plus"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:603
-msgid "HP DeskJet 660C"
+msgid "HP DesignJet 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:604
-msgid "HP DeskJet 670C"
+msgid "HP DesignJet 2500CP"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:605
-msgid "HP DeskJet 670TV"
+msgid "HP DesignJet 3500CP"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:606
-msgid "HP DeskJet 672C"
+msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:607
-msgid "HP DeskJet 680C"
+msgid "HP DeskJet 400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:608
-msgid "HP DeskJet 682C"
+msgid "HP DeskJet 420C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:609
-msgid "HP DeskJet 690C"
+msgid "HP DeskJet 450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:610
-msgid "HP DeskJet 692C"
+msgid "HP DeskJet 500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:611
-msgid "HP DeskJet 693C"
+msgid "HP DeskJet 500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:612
-msgid "HP DeskJet 694C"
+msgid "HP DeskJet 505J Plus"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:613
-msgid "HP DeskJet 695C"
+msgid "HP DeskJet 510"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:614
-msgid "HP DeskJet 697C"
+msgid "HP DeskJet 520"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:615
-msgid "HP DeskJet 810C"
+msgid "HP DeskJet 540C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:616
-msgid "HP DeskJet 812C"
+msgid "HP DeskJet 550C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:617
-msgid "HP DeskJet 815C"
+msgid "HP DeskJet 5550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:618
-msgid "HP DeskJet 816C"
+msgid "HP DeskJet 5551"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:619
-msgid "HP DeskJet 825C"
+msgid "HP DeskJet 560C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:620
-msgid "HP DeskJet 830C"
+msgid "HP DeskJet 600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:621
-msgid "HP DeskJet 832C"
+msgid "HP DeskJet 600C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:622
-msgid "HP DeskJet 840C"
+msgid "HP DeskJet 610C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:623
-msgid "HP DeskJet 841C"
+msgid "HP DeskJet 610CL"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:624
-msgid "HP DeskJet 842C"
+msgid "HP DeskJet 6122"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:625
-msgid "HP DeskJet 843C"
+msgid "HP DeskJet 6127"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:626
-msgid "HP DeskJet 845C"
+msgid "HP DeskJet 612C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:627
-msgid "HP DeskJet 850C"
+msgid "HP DeskJet 640C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:628
-msgid "HP DeskJet 855C"
+msgid "HP DeskJet 648C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:629
-msgid "HP DeskJet 870C"
+msgid "HP DeskJet 660C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:630
-msgid "HP DeskJet 880C"
+msgid "HP DeskJet 670C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:631
-msgid "HP DeskJet 882C"
+msgid "HP DeskJet 670TV"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:632
-msgid "HP DeskJet 890C"
+msgid "HP DeskJet 672C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:633
-msgid "HP DeskJet 895C"
+msgid "HP DeskJet 680C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:634
-msgid "HP DeskJet 916C"
+msgid "HP DeskJet 682C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:635
-msgid "HP DeskJet 920C"
+msgid "HP DeskJet 690C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:636
-msgid "HP DeskJet 9300"
+msgid "HP DeskJet 692C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:637
-msgid "HP DeskJet 930C"
+msgid "HP DeskJet 693C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:638
-msgid "HP DeskJet 932C"
+msgid "HP DeskJet 694C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:639
-msgid "HP DeskJet 933C"
+msgid "HP DeskJet 695C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:640
-msgid "HP DeskJet 934C"
+msgid "HP DeskJet 697C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:641
-msgid "HP DeskJet 935C"
+msgid "HP DeskJet 810C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:642
-msgid "HP DeskJet 940C"
+msgid "HP DeskJet 812C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:643
-msgid "HP DeskJet 948C"
+msgid "HP DeskJet 815C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:644
-msgid "HP DeskJet 950C"
+msgid "HP DeskJet 816C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:645
-msgid "HP DeskJet 952C"
+msgid "HP DeskJet 825C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:646
-msgid "HP DeskJet 955C"
+msgid "HP DeskJet 830C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:647
-msgid "HP DeskJet 957C"
+msgid "HP DeskJet 832C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:648
-msgid "HP DeskJet 959C"
+msgid "HP DeskJet 840C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:649
-msgid "HP DeskJet 960C"
+msgid "HP DeskJet 841C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:650
-msgid "HP DeskJet 970C"
+msgid "HP DeskJet 842C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:651
-msgid "HP DeskJet 975C"
+msgid "HP DeskJet 843C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:652
-msgid "HP DeskJet 980C"
+msgid "HP DeskJet 845C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:653
-msgid "HP DeskJet 990C"
+msgid "HP DeskJet 850C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:654
-msgid "HP DeskJet 995C"
+msgid "HP DeskJet 855C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:655
-msgid "HP DeskJet 1100C"
+msgid "HP DeskJet 870C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:656
-msgid "HP DeskJet 1120C"
+msgid "HP DeskJet 880C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:657
-msgid "HP DeskJet 1125C"
+msgid "HP DeskJet 882C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:658
-msgid "HP DeskJet 1200C"
+msgid "HP DeskJet 890C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:659
-msgid "HP DeskJet 1220C"
+msgid "HP DeskJet 895C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:660
-msgid "HP DeskJet 1600C"
+msgid "HP DeskJet 916C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:661
-msgid "HP DeskJet 1600CM"
+msgid "HP DeskJet 920C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:662
-msgid "HP DeskJet 2000"
+msgid "HP DeskJet 9300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:663
-msgid "HP DeskJet 2500"
+msgid "HP DeskJet 930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:664
-msgid "HP DeskJet 2500CM"
+msgid "HP DeskJet 932C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:665
-msgid "HP DeskJet 340C"
+msgid "HP DeskJet 933C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:666
-msgid "HP DeskJet 3810"
+msgid "HP DeskJet 934C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:667
-msgid "HP DeskJet 3816"
+msgid "HP DeskJet 935C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:668
-msgid "HP DeskJet 3820"
+msgid "HP DeskJet 940C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:669
-msgid "HP DeskJet 3822"
+msgid "HP DeskJet 948C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:670
-msgid "HP LaserJet 2"
+msgid "HP DeskJet 950C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:671
-msgid "HP LaserJet 2D"
+msgid "HP DeskJet 952C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:672
-msgid "HP LaserJet 2P Plus"
+msgid "HP DeskJet 955C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:673
-msgid "HP LaserJet 2P"
+msgid "HP DeskJet 957C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:674
-msgid "HP LaserJet 3"
+msgid "HP DeskJet 959C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:675
-msgid "HP LaserJet 3D"
+msgid "HP DeskJet 960C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:676
-msgid "HP LaserJet 3P w/ PCL5"
+msgid "HP DeskJet 970C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:677
-msgid "HP LaserJet 3P w/PS"
+msgid "HP DeskJet 975C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:678
-msgid "HP LaserJet 4 Plus"
+msgid "HP DeskJet 980C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:679
-msgid "HP LaserJet 4"
+msgid "HP DeskJet 990C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:680
-msgid "HP LaserJet 4L"
+msgid "HP DeskJet 995C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:681
-msgid "HP LaserJet 4M"
+msgid "HP DeskJet 1100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:682
-msgid "HP LaserJet 4ML"
+msgid "HP DeskJet 1120C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:683
-msgid "HP LaserJet 4P"
+msgid "HP DeskJet 1125C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:684
-msgid "HP LaserJet 4Si"
+msgid "HP DeskJet 1200C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:685
-msgid "HP LaserJet 4V"
+msgid "HP DeskJet 1220C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:686
-msgid "HP LaserJet 5"
+msgid "HP DeskJet 1600C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:687
-msgid "HP LaserJet 5L"
+msgid "HP DeskJet 1600CM"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:688
-msgid "HP LaserJet 5M"
+msgid "HP DeskJet 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:689
-msgid "HP LaserJet 5MP"
+msgid "HP DeskJet 2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:690
-msgid "HP LaserJet 5P"
+msgid "HP DeskJet 2500CM"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:691
-msgid "HP LaserJet 5Si"
+msgid "HP DeskJet 340C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:692
-msgid "HP LaserJet 6"
+msgid "HP DeskJet 3810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:693
-msgid "HP LaserJet 6L"
+msgid "HP DeskJet 3816"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:694
-msgid "HP LaserJet 6MP"
+msgid "HP DeskJet 3820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:695
-msgid "HP LaserJet 6P"
+msgid "HP DeskJet 3822"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:696
-msgid "HP LaserJet 1010"
+msgid "HP LaserJet 2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:697
-msgid "HP LaserJet 1012"
+msgid "HP LaserJet 2D"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:698
-msgid "HP LaserJet 1015"
+msgid "HP LaserJet 2P Plus"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:699
-msgid "HP LaserJet 1100"
+msgid "HP LaserJet 2P"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:700
-msgid "HP LaserJet 1100A"
+msgid "HP LaserJet 3"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:701
-msgid "HP LaserJet 1150"
+msgid "HP LaserJet 3D"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:702
-msgid "HP LaserJet 1200"
+msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:703
-msgid "HP LaserJet 1220"
+msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:704
-msgid "HP LaserJet 1300"
+msgid "HP LaserJet 4 Plus"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:705
-msgid "HP LaserJet 2100"
+msgid "HP LaserJet 4"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:706
-msgid "HP LaserJet 2100M"
+msgid "HP LaserJet 4L"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:707
-msgid "HP LaserJet 2200"
+msgid "HP LaserJet 4M"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:708
-msgid "HP LaserJet 2300"
+msgid "HP LaserJet 4ML"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:709
-msgid "HP LaserJet 3200"
+msgid "HP LaserJet 4P"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:710
-msgid "HP LaserJet 3200m"
+msgid "HP LaserJet 4Si"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:711
-msgid "HP LaserJet 3200se"
+msgid "HP LaserJet 4V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:712
-msgid "HP LaserJet 3300 MFP"
+msgid "HP LaserJet 5"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:713
-msgid "HP LaserJet 3310 MFP"
+msgid "HP LaserJet 5L"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:714
-msgid "HP LaserJet 3320 MFP"
+msgid "HP LaserJet 5M"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:715
-msgid "HP LaserJet 3320N MFP"
+msgid "HP LaserJet 5MP"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:716
-msgid "HP LaserJet 3330 MFP"
+msgid "HP LaserJet 5P"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:717
-msgid "HP LaserJet 4000"
+msgid "HP LaserJet 5Si"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:718
-msgid "HP LaserJet 4050"
+msgid "HP LaserJet 6"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:719
-msgid "HP LaserJet 4100"
+msgid "HP LaserJet 6L"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:720
-msgid "HP LaserJet 4200"
+msgid "HP LaserJet 6MP"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:721
-msgid "HP LaserJet 4300"
+msgid "HP LaserJet 6P"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:722
-msgid "HP LaserJet 5000"
+msgid "HP LaserJet 1010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:723
-msgid "HP LaserJet 5100"
+msgid "HP LaserJet 1012"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:724
-msgid "HP LaserJet 8000"
+msgid "HP LaserJet 1015"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:725
-msgid "HP LaserJet 8100"
+msgid "HP LaserJet 1022"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:726
-msgid "HP LaserJet 8150"
+msgid "HP LaserJet 1100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:727
-msgid "HP LaserJet 9000"
+msgid "HP LaserJet 1100A"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:728
-msgid "HP Mopier 240"
+msgid "HP LaserJet 1150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:729
-msgid "HP Mopier 320"
+msgid "HP LaserJet 1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:730
-msgid "HP OfficeJet 300"
+msgid "HP LaserJet 1220"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:731
-msgid "HP OfficeJet 330"
+msgid "HP LaserJet 1300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:732
-msgid "HP OfficeJet 350"
+msgid "HP LaserJet 2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:733
-msgid "HP OfficeJet 500"
+msgid "HP LaserJet 2100M"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:734
-msgid "HP OfficeJet 520"
+msgid "HP LaserJet 2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:735
-msgid "HP OfficeJet 570"
+msgid "HP LaserJet 2300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:736
-msgid "HP OfficeJet 580"
+msgid "HP LaserJet 3200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:737
-msgid "HP OfficeJet 590"
+msgid "HP LaserJet 3200m"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:738
-msgid "HP OfficeJet 600"
+msgid "HP LaserJet 3200se"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:739
-msgid "HP OfficeJet 610"
+msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:740
-msgid "HP OfficeJet 625"
+msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:741
-msgid "HP OfficeJet 630"
+msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:742
-msgid "HP OfficeJet 635"
+msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:743
-msgid "HP OfficeJet 700"
+msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:744
-msgid "HP OfficeJet 710"
+msgid "HP LaserJet 4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:745
-msgid "HP OfficeJet 720"
+msgid "HP LaserJet 4050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:746
-msgid "HP OfficeJet 725"
+msgid "HP LaserJet 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:747
-msgid "HP OfficeJet 5105"
+msgid "HP LaserJet 4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:748
-msgid "HP OfficeJet 5110"
+msgid "HP LaserJet 4300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:749
-msgid "HP OfficeJet 5110xi"
+msgid "HP LaserJet 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:750
-msgid "HP OfficeJet 6105"
+msgid "HP LaserJet 5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:751
-msgid "HP OfficeJet 6110"
+msgid "HP LaserJet 8000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:752
-msgid "HP OfficeJet 7110"
+msgid "HP LaserJet 8100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:753
-msgid "HP OfficeJet 7130"
+msgid "HP LaserJet 8150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:754
-msgid "HP OfficeJet 7140"
+msgid "HP LaserJet 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:755
-msgid "HP OfficeJet D125"
+msgid "HP Mopier 240"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:756
-msgid "HP OfficeJet D135"
+msgid "HP Mopier 320"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:757
-msgid "HP OfficeJet D145"
+msgid "HP OfficeJet 300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:758
-msgid "HP OfficeJet D155"
+msgid "HP OfficeJet 330"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:759
-msgid "HP OfficeJet G55"
+msgid "HP OfficeJet 350"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:760
-msgid "HP OfficeJet G85"
+msgid "HP OfficeJet 500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:761
-msgid "HP OfficeJet G95"
+msgid "HP OfficeJet 520"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:762
-msgid "HP OfficeJet K60"
+msgid "HP OfficeJet 570"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:763
-msgid "HP OfficeJet K60xi"
+msgid "HP OfficeJet 580"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:764
-msgid "HP OfficeJet K80"
+msgid "HP OfficeJet 590"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:765
-msgid "HP OfficeJet K80xi"
+msgid "HP OfficeJet 600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:766
-msgid "HP OfficeJet LX"
+msgid "HP OfficeJet 610"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:767
-msgid "HP OfficeJet Pro 1150C"
+msgid "HP OfficeJet 625"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:768
-msgid "HP OfficeJet Pro 1170C"
+msgid "HP OfficeJet 630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:769
-msgid "HP OfficeJet Pro 1175C"
+msgid "HP OfficeJet 635"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:770
-msgid "HP OfficeJet R40"
+msgid "HP OfficeJet 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:771
-msgid "HP OfficeJet R45"
+msgid "HP OfficeJet 710"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:772
-msgid "HP OfficeJet R60"
+msgid "HP OfficeJet 720"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:773
-msgid "HP OfficeJet R65"
+msgid "HP OfficeJet 725"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:774
-msgid "HP OfficeJet R80"
+msgid "HP OfficeJet 5105"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:775
-msgid "HP OfficeJet T45"
+msgid "HP OfficeJet 5110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:776
-msgid "HP OfficeJet T65"
+msgid "HP OfficeJet 5110xi"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:777
-msgid "HP OfficeJet V40"
+msgid "HP OfficeJet 6105"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:778
-msgid "HP OfficeJet V40xi"
+msgid "HP OfficeJet 6110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:779
-msgid "HP OfficeJet"
+msgid "HP OfficeJet 7110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:780
-msgid "HP PSC 370"
+msgid "HP OfficeJet 7130"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:781
-msgid "HP PSC 380"
+msgid "HP OfficeJet 7140"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:782
-msgid "HP PSC 500"
+msgid "HP OfficeJet D125"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:783
-msgid "HP PSC 750"
+msgid "HP OfficeJet D135"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:784
-msgid "HP PSC 950"
+msgid "HP OfficeJet D145"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:785
-msgid "HP PSC 950xi"
+msgid "HP OfficeJet D155"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:786
-msgid "HP PSC 2110"
+msgid "HP OfficeJet G55"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:787
-msgid "HP PSC 2150"
+msgid "HP OfficeJet G85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:788
-msgid "HP PSC 2210"
+msgid "HP OfficeJet G95"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:789
-msgid "HP PhotoSmart 7150"
+msgid "HP OfficeJet K60"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:790
-msgid "HP PhotoSmart 7345"
+msgid "HP OfficeJet K60xi"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:791
-msgid "HP PhotoSmart 7350"
+msgid "HP OfficeJet K80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:792
-msgid "HP PhotoSmart 7550"
+msgid "HP OfficeJet K80xi"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:793
-msgid "HP PhotoSmart P100"
+msgid "HP OfficeJet LX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:794
-msgid "HP PhotoSmart P130"
+msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:795
-msgid "HP PhotoSmart P230"
+msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:796
-msgid "HP PhotoSmart P1000"
+msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:797
-msgid "HP PhotoSmart P1100"
+msgid "HP OfficeJet R40"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:798
-msgid "HP PhotoSmart P1115"
+msgid "HP OfficeJet R45"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:799
-msgid "HP PhotoSmart P1215"
+msgid "HP OfficeJet R60"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:800
-msgid "HP PhotoSmart P1218"
+msgid "HP OfficeJet R65"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:801
-msgid "HP PhotoSmart P1315"
+msgid "HP OfficeJet R80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:802
-msgid "HP e-printer e20"
+msgid "HP OfficeJet T45"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:803
-msgid "IBM 4019"
+msgid "HP OfficeJet T65"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:804
-msgid "IBM 4029 030 LaserPrinter 10"
+msgid "HP OfficeJet V40"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:805
-msgid "IBM 4312"
+msgid "HP OfficeJet V40xi"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:806
-msgid "IBM Infoprint 12"
+msgid "HP OfficeJet"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:807
-msgid "IBM Page Printer 3112"
+msgid "HP PSC 370"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:808
-msgid "Infotec 4651 MF"
+msgid "HP PSC 380"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:809
-msgid "Kyocera F-1010"
+msgid "HP PSC 500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:810
-msgid "Kyocera FS-600 - KPDL-2"
+msgid "HP PSC 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:811
-msgid "Kyocera FS-600"
+msgid "HP PSC 950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:812
-msgid "Kyocera FS-680"
+msgid "HP PSC 950xi"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:813
-msgid "Kyocera FS-800"
+msgid "HP PSC 2110"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:814
-msgid "Kyocera FS-1000"
+msgid "HP PSC 2150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:815
-msgid "Kyocera FS-1000+"
+msgid "HP PSC 2210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:816
-msgid "Kyocera FS-1010"
+msgid "HP PhotoSmart 7150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:817
-msgid "Kyocera FS-1050"
+msgid "HP PhotoSmart 7345"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:818
-msgid "Kyocera FS-1200"
+msgid "HP PhotoSmart 7350"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:819
-msgid "Kyocera FS-1600"
+msgid "HP PhotoSmart 7550"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:820
-msgid "Kyocera FS-1600+"
+msgid "HP PhotoSmart P100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:821
-msgid "Kyocera FS-1700"
+msgid "HP PhotoSmart P130"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:822
-msgid "Kyocera FS-1700+"
+msgid "HP PhotoSmart P230"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:823
-msgid "Kyocera FS-1750"
+msgid "HP PhotoSmart P1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:824
-msgid "Kyocera FS-1800"
+msgid "HP PhotoSmart P1100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:825
-msgid "Kyocera FS-1800+"
+msgid "HP PhotoSmart P1115"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:826
-msgid "Kyocera FS-1900"
+msgid "HP PhotoSmart P1215"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:827
-msgid "Kyocera FS-3500"
+msgid "HP PhotoSmart P1218"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:828
-msgid "Kyocera FS-3600"
+msgid "HP PhotoSmart P1315"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:829
-msgid "Kyocera FS-3600+"
+msgid "HP e-printer e20"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:830
-msgid "Kyocera FS-3700"
+msgid "IBM 4019"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:831
-msgid "Kyocera FS-3700+"
+msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:832
-msgid "Kyocera FS-3750"
+msgid "IBM 4312"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:833
-msgid "Kyocera FS-3800"
+msgid "IBM Infoprint 12"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:834
-msgid "Kyocera FS-5800C"
+msgid "IBM Page Printer 3112"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:835
-msgid "Kyocera FS-5900C"
+msgid "Infotec 4651 MF"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:836
-msgid "Kyocera FS-6500"
+msgid "Kyocera F-1010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:837
-msgid "Kyocera FS-6500+"
+msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:838
-msgid "Kyocera FS-6700"
+msgid "Kyocera FS-600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:839
-msgid "Kyocera FS-7000"
+msgid "Kyocera FS-680"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:840
-msgid "Kyocera FS-7000+"
+msgid "Kyocera FS-800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:841
-msgid "Kyocera FS-8000C"
+msgid "Kyocera FS-1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:842
-msgid "Kyocera FS-9000"
+msgid "Kyocera FS-1000+"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:843
-msgid "Kyocera FS-9100DN"
+msgid "Kyocera FS-1010"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:844
-msgid "Kyocera FS-9500DN"
+msgid "Kyocera FS-1050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:845
-msgid "Kyocera KM-1530"
+msgid "Kyocera FS-1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:846
-msgid "Kyocera KM-1810"
+msgid "Kyocera FS-1600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:847
-msgid "Kyocera KM-2030"
+msgid "Kyocera FS-1600+"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:848
-msgid "Kyocera KM-2530"
+msgid "Kyocera FS-1700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:849
-msgid "Kyocera KM-3530"
+msgid "Kyocera FS-1700+"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:850
-msgid "Kyocera KM-4230"
+msgid "Kyocera FS-1750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:851
-msgid "Kyocera KM-4530"
+msgid "Kyocera FS-1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:852
-msgid "Kyocera KM-5230"
+msgid "Kyocera FS-1800+"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:853
-msgid "Kyocera KM-5530"
+msgid "Kyocera FS-1900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:854
-msgid "Kyocera KM-6230"
+msgid "Kyocera FS-3500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:855
-msgid "Lexmark 4076"
+msgid "Kyocera FS-3600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:856
-msgid "Lexmark Optra E"
+msgid "Kyocera FS-3600+"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:857
-msgid "Lexmark Optra E+"
+msgid "Kyocera FS-3700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:858
-msgid "Lexmark Optra E220"
+msgid "Kyocera FS-3700+"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:859
-msgid "Lexmark Valuewriter 300"
+msgid "Kyocera FS-3750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:860
-msgid "Minolta PagePro 6"
+msgid "Kyocera FS-3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:861
-msgid "Minolta PagePro 6e"
+msgid "Kyocera FS-5800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:862
-msgid "Minolta PagePro 6ex"
+msgid "Kyocera FS-5900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:863
-msgid "Minolta PagePro 8"
+msgid "Kyocera FS-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:864
-msgid "Minolta PagePro 8L"
+msgid "Kyocera FS-6500+"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:865
-msgid "Minolta PagePro 1100"
+msgid "Kyocera FS-6700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:866
-msgid "NEC SuperScript 660i"
+msgid "Kyocera FS-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:867
-msgid "NEC SuperScript 860"
+msgid "Kyocera FS-7000+"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:868
-msgid "NEC SuperScript 870"
+msgid "Kyocera FS-8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:869
-msgid "NEC SuperScript 1260"
+msgid "Kyocera FS-9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:870
-msgid "NEC SuperScript 1400"
+msgid "Kyocera FS-9100DN"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:871
-msgid "NEC SuperScript 1800"
+msgid "Kyocera FS-9500DN"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:872
-msgid "Okidata OL400"
+msgid "Kyocera KM-1530"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:873
-msgid "Okidata OL400e"
+msgid "Kyocera KM-1810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:874
-msgid "Okidata OL400ex"
+msgid "Kyocera KM-2030"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:875
-msgid "Okidata OL410e"
+msgid "Kyocera KM-2530"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:876
-msgid "Okidata OL600e"
+msgid "Kyocera KM-3530"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:877
-msgid "Okidata OL610e/S"
+msgid "Kyocera KM-4230"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:878
-msgid "Okidata OL800"
+msgid "Kyocera KM-4530"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:879
-msgid "Okidata OL810ex"
+msgid "Kyocera KM-5230"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:880
-msgid "Okidata Okipage 6e"
+msgid "Kyocera KM-5530"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:881
-msgid "Okidata Okipage 6ex"
+msgid "Kyocera KM-6230"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:882
-msgid "Okidata Okipage 8p"
+msgid "Lexmark 4076"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:883
-msgid "Okidata Okipage 10e"
+msgid "Lexmark Optra E"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:884
-msgid "Okidata Okipage 10ex"
+msgid "Lexmark Optra E+"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:885
-msgid "Okidata Okipage 14ex"
+msgid "Lexmark Optra E220"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:886
-msgid "Okidata Super 6e"
+msgid "Lexmark Valuewriter 300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:887
-msgid "Olivetti JP350S"
+msgid "Minolta PagePro 6"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:888
-msgid "Olivetti PG 306"
+msgid "Minolta PagePro 6e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:889
-msgid "PCPI 1030"
+msgid "Minolta PagePro 6ex"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:890
-msgid "Panasonic KX-P4410"
+msgid "Minolta PagePro 8"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:891
-msgid "Panasonic KX-P4450"
+msgid "Minolta PagePro 8L"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:892
-msgid "Panasonic KX-P6150"
+msgid "Minolta PagePro 1100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:893
-msgid "Panasonic KX-P6500"
+msgid "NEC SuperScript 660i"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:894
-msgid "Raven LP-410"
+msgid "NEC SuperScript 860"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:895
-msgid "Ricoh Aficio 220"
+msgid "NEC SuperScript 870"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:896
-msgid "Ricoh Aficio 401"
+msgid "NEC SuperScript 1260"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:897
-msgid "Ricoh Aficio 700"
+msgid "NEC SuperScript 1400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:898
-msgid "Samsung ML-85"
+msgid "NEC SuperScript 1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:899
-msgid "Samsung ML-4600"
+msgid "Okidata OL400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:900
-msgid "Samsung ML-5000a"
+msgid "Okidata OL400e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:901
-msgid "Samsung ML-6000"
+msgid "Okidata OL400ex"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:902
-msgid "Samsung ML-6100"
+msgid "Okidata OL410e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:903
-msgid "Samsung ML-7000"
+msgid "Okidata OL600e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:904
-msgid "Samsung ML-7000N"
+msgid "Okidata OL610e/S"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:905
-msgid "Samsung ML-7000P"
+msgid "Okidata OL800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:906
-msgid "Samsung ML-7050"
+msgid "Okidata OL810ex"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:907
-msgid "Samsung QL-5100A"
+msgid "Okidata Okipage 6e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:908
-msgid "Samsung QL-6050"
+msgid "Okidata Okipage 6ex"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:909
-msgid "Seiko SpeedJET 200"
+msgid "Okidata Okipage 8p"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:910
-msgid "Sharp AR-161"
+msgid "Okidata Okipage 10e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:911
-msgid "Sony IJP-V100"
+msgid "Okidata Okipage 10ex"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:912
-msgid "Star LS-04"
+msgid "Okidata Okipage 14ex"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:913
-msgid "Star LaserPrinter 8"
+msgid "Okidata Super 6e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:914
-msgid "Tally MT908"
+msgid "Olivetti JP350S"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:915
-msgid "Xerox Able 1406"
+msgid "Olivetti PG 306"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:916
-msgid "Xerox DocuPrint 4508"
+msgid "PCPI 1030"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:917
-msgid "Xerox DocuPrint C20"
+msgid "Panasonic KX-P4410"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:918
-msgid "Xerox DocuPrint N4512"
+msgid "Panasonic KX-P4450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:919
-msgid "Xerox DocuPrint N4512PS"
+msgid "Panasonic KX-P6150"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:920
-msgid "Xerox DocuPrint P12"
+msgid "Panasonic KX-P6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:921
-msgid "Xerox DocuPrint P1202"
+msgid "Raven LP-410"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:922
-msgid "Xerox DocuPrint P8e"
+msgid "Ricoh Aficio 220"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:923
-msgid "Xerox Document Centre 400"
+msgid "Ricoh Aficio 401"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:924
-msgid "Xerox WorkCentre M118"
+msgid "Ricoh Aficio 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:925
-msgid "Compaq IJ1200"
+msgid "Samsung ML-85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:926
-msgid "Lexmark X73"
+msgid "Samsung ML-4600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:927
-msgid "Lexmark Z42"
+msgid "Samsung ML-5000a"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:928
-msgid "Lexmark Z43"
+msgid "Samsung ML-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:929
-msgid "Lexmark Z52"
+msgid "Samsung ML-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:930
-msgid "Lexmark Z53"
+msgid "Samsung ML-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:931
-msgid "Olympus P-10"
+msgid "Samsung ML-7000N"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:932
-msgid "Olympus P-11"
+msgid "Samsung ML-7000P"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:933
-msgid "Olympus P-200"
+msgid "Samsung ML-7050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:934
-msgid "Olympus P-300"
+msgid "Samsung QL-5100A"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:935
-msgid "Olympus P-300E"
+msgid "Samsung QL-6050"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:936
-msgid "Olympus P-300U"
+msgid "Seiko SpeedJET 200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:937
-msgid "Olympus P-330E"
+msgid "Sharp AR-161"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:938
-msgid "Olympus P-330NE"
+msgid "Sharp AR-M257"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:939
-msgid "Olympus P-400"
+msgid "Sony IJP-V100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:940
-msgid "Olympus P-440"
+msgid "Star LS-04"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:941
-msgid "Olympus P-S100"
+msgid "Star LaserPrinter 8"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:942
-msgid "Canon CP-10"
+msgid "Tally MT908"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:943
-msgid "Canon CP-100"
+msgid "Xerox Able 1406"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:944
-msgid "Canon CP-200"
+msgid "Xerox DocuPrint 4508"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:945
-msgid "Canon CP-220"
+msgid "Xerox DocuPrint C20"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:946
-msgid "Canon CP-300"
+msgid "Xerox DocuPrint N4512"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:947
-msgid "Canon CP-330"
+msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:948
-msgid "Canon SELPHY-CP-400"
+msgid "Xerox DocuPrint P12"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:949
-msgid "Canon SELPHY-CP-500"
+msgid "Xerox DocuPrint P1202"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:950
-msgid "Canon SELPHY-CP-510"
+msgid "Xerox DocuPrint P8e"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:951
-msgid "Canon SELPHY-CP-600"
+msgid "Xerox Document Centre 400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:952
-msgid "Canon SELPHY-CP-710"
+msgid "Xerox WorkCentre M118"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:953
-msgid "Sony DPP-EX5"
+msgid "Compaq IJ1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:954
-msgid "Sony DPP-EX7"
+msgid "Lexmark X73"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:955
-msgid "Sony UP-DP10"
+msgid "Lexmark Z42"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:956
-msgid "Sony UP-DR100"
+msgid "Lexmark Z43"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:957
-msgid "Sony UP-DR150"
+msgid "Lexmark Z52"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:958
-msgid "Fujifilm Printpix-CX-400"
+msgid "Lexmark Z53"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:959
-msgid "Fujifilm Printpix-CX-550"
+msgid "Olympus P-10"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:960
-msgid "Fujifilm FinePix-NX-500"
+msgid "Olympus P-11"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:961
-msgid "Kodak Easyshare-Printer-Dock"
+msgid "Olympus P-200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:962
-msgid "RAW DATA 16 bit"
+msgid "Olympus P-300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:963
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:964
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:965
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:966
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:967
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:968
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:969
+msgid "Olympus P-S100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:970
+msgid "Canon CP-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:971
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:972
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:973
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:974
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:975
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:976
+msgid "Canon SELPHY-CP-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:977
+msgid "Canon SELPHY-CP-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:978
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:979
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:980
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:981
+msgid "Canon SELPHY-CP-720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:982
+msgid "Canon SELPHY-CP-730"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:983
+msgid "Canon SELPHY-CP-740"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:984
+msgid "Canon SELPHY-CP-750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:985
+msgid "Canon SELPHY ES1"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:986
+msgid "Canon SELPHY ES2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:987
+msgid "Canon SELPHY ES20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:988
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:989
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:990
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:991
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:992
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:993
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:994
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:995
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:996
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr ""
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Points"
 msgstr ""
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "Set the base unit of measurement to millimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Standard Command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Custom Command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr ""
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 msgid "Print to a file"
 msgstr ""
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 msgid "Set Default"
 msgstr ""
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6051,378 +6219,386 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 msgid "Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 msgid "Width of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 msgid "Height of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 msgid "Automatic Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 msgid "Image Position"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 msgid "Distance from the left of the paper to the right of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 msgid "Distance from the right of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 msgid "Distance from the bottom of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Horizontal"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Vertical"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 msgid "Printer Make:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 msgid "Select the make of your printer"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 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:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 msgid "Printer Queue:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "Enter the correct command to print to your printer. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 msgid "File to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 msgid "Print To File"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 msgid "Enter the name you wish to give this logical printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 msgid "About Gutenprint "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 msgid "Gutenprint Version "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 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:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 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:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+msgid "Set Printer Option Defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 msgid "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 msgid "Set the print size to the size of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 msgid "Output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 msgid "Size Units:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 msgid " "
 msgstr ""
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr ""
 
@@ -6455,11 +6631,11 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 msgid "Printer"
 msgstr ""
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 msgid "(Default Printer)"
 msgstr ""
 
@@ -6507,83 +6683,83 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 msgid "Printer Features"
 msgstr ""
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 msgid "Common"
 msgstr ""
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr ""
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -6646,17 +6822,17 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -6700,95 +6876,100 @@ msgid ""
 "    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr ""
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr ""
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr ""
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr ""
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, c-format
+msgid "Unknown printer %s!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -6796,214 +6977,212 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, c-format
 msgid "Status: Waiting\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, c-format
 msgid "Error: Ink out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, c-format
 msgid "Error: Paper out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr ""
@@ -7093,7 +7272,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr ""
@@ -7112,7 +7291,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr ""
 
@@ -7191,7 +7370,7 @@ msgstr ""
 #: src/escputil/escputil.c:1908
 #, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7199,12 +7378,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr ""
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7212,42 +7391,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7256,7 +7435,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr ""
diff --git a/po/hu.gmo b/po/hu.gmo
index 8d1d576..0c650d4 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index acabb51..507381c 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: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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:1737
+#: src/main/print-escp2.c:1752
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -80,16 +80,16 @@ msgstr "Előszórt bemenet"
 msgid "Density"
 msgstr "Sűrűség"
 
-#: 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -152,26 +152,26 @@ msgstr "Színátalakítási modul"
 msgid "Dither algorithm"
 msgstr "Szórási algoritmus"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 msgid "Page Size"
 msgstr "Oldalméret"
 
-#: 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -179,271 +179,272 @@ msgstr "Oldalméret"
 msgid "Basic Printer Setup"
 msgstr "Nyomtató alapbeállításai"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: 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: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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "Papír típusa"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "Papír forrása"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr "CD középpontjának mérete"
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 #, 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
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, 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
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 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
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Felbontás"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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:252 src/main/print-escp2.c:238
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr "Tintacsatornák"
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 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:264 src/main/print-escp2.c:334
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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:265 src/main/print-escp2.c:335
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "Kétoldalas nyomtatás"
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr "Kétoldalas/fordítva beállítás"
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: 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:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: 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:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: 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:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: 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:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: 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:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: 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:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: 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:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: 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:325 src/main/print-canon.c:326
-#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
+#: src/main/print-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: 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: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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: 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:333 src/main/print-canon.c:334
-#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
+#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: 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:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 msgid "Light Yellow Transition"
 msgstr "Világossárga átmenet"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 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
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr "Rövidebbik él (tükrözve)"
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "5 hüvelykes CD"
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "3 hüvelykes CD"
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Egyéni"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr "Normál"
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Színes"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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"
@@ -481,9 +482,9 @@ msgstr "Nyers"
 msgid "Pre-Dithered"
 msgstr "Előszórt"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Szürkeárnyalatos"
 
@@ -563,7 +564,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:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr "Nyers csatornák"
 
@@ -623,15 +624,16 @@ 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/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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Ciánkék"
 
@@ -639,15 +641,16 @@ 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/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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Bíborvörös"
 
@@ -655,15 +658,16 @@ 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/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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Sárga"
 
@@ -671,10 +675,10 @@ 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/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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr "Vörös"
 
@@ -682,8 +686,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:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr "Zöld"
 
@@ -691,10 +695,10 @@ 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/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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr "Kék"
 
@@ -703,14 +707,16 @@ 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Fekete"
 
@@ -718,7 +724,7 @@ msgstr "Fekete"
 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:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr "Ciánkékegyensúly"
 
@@ -731,7 +737,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:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 msgid "Magenta Balance"
 msgstr "Bíborvörös-egyensúly"
 
@@ -739,7 +745,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:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 msgid "Yellow Balance"
 msgstr "Sárgaegyensúly"
 
@@ -766,9 +772,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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 msgid "Advanced Output Control"
 msgstr "Haladó kimenetvezérlés"
 
@@ -917,77 +923,77 @@ msgstr "Szürkeösszetevő-csökkentési görbe"
 msgid "Traditional Gutenprint color conversion"
 msgstr "Hagyományos Gutenprint színátalakítás"
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, 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:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "\"%s\" nem érvényes %s\n"
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, 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:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, 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:620
+#: src/main/printers.c:631
 #, 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:628
+#: src/main/printers.c:639
 #, 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:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr "nincs tördelés"
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr "tördelés"
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Ismeretlen típusú paraméter: %s (%d)\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, 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:761
+#: src/main/printers.c:772
 msgid "Page size is not valid\n"
 msgstr "Érvénytelen oldalméret\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, 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:788
+#: src/main/printers.c:799
 #, 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:794
+#: src/main/printers.c:805
 msgid "Height must be greater than zero\n"
 msgstr "A magasság nullánál nagyobb kell legyen\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 msgid "Width must be greater than zero\n"
 msgstr "A szélesség nullánál nagyobb kell legyen\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -996,7 +1002,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:813
+#: src/main/printers.c:824
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1005,266 +1011,278 @@ 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr "Automatikus nyomtatási mód"
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr "Alap kimenetvezérlés"
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr "Automatikus nyomtatási mód"
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: 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:228
+#: src/main/print-escp2.c:229
 msgid "Resolution of the print"
 msgstr "A nyomat felbontása"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr "Kiterjesztett fényesség"
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr "Fényességkiterjesztés hozzáadása"
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 msgid "Ink Set"
 msgstr "Tintakészlet"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Nyomtatás iránya"
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr "Haladó kimenetvezérlés"
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 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:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr "Szegély nélküli"
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr "Nyomtatás szegélyek nélkül"
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Kihagyási módszer"
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr "A használandó kihagyásminta"
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr "Hangolja szükség szerint a pontméretet"
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 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:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 msgid "Output Order"
 msgstr "Kimeneti sorrend"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr "Igazítási lépések"
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr "Igazítási lehetőségek"
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 msgid "Ink change command"
 msgstr "Tintacsere parancsa"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr "Alternatív igazítási lépések"
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 msgid "Alternate Alignment Choices"
 msgstr "Alternatív igazítási lehetőségek"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr "Támogatja a csomag módot"
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+#, fuzzy
+msgid "Supports D4 Packet Mode"
+msgstr "Támogatja a csomag módot"
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 msgid "Channel Names"
 msgstr "Csatornanevek"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr "Nyers csatornaszám"
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 msgid "Cyan Map"
 msgstr "Ciánkék-leképezés"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 msgid "Adjust the cyan map"
 msgstr "A ciánkék-leképezés beállítása"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 msgid "Magenta Map"
 msgstr "Bíborvörös-leképezés"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 msgid "Adjust the magenta map"
 msgstr "A bíborvörös-leképezés beállítása"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 msgid "Yellow Map"
 msgstr "Sárga-leképezés"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 msgid "Adjust the yellow map"
 msgstr "A sárga-leképezés beállítása"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 msgid "Blue Map"
 msgstr "Kék-leképezés"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 msgid "Adjust the blue map"
 msgstr "A kék-leképezés beállítása"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr "Vörös-leképezés"
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 msgid "Adjust the red map"
 msgstr "A vörös-leképezés beállítása"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr "Vörös sűrűsége"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr "A vörös sűrűségének beállítása"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr "Kék sűrűsége"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr "A kék sűrűségének beállítása"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 msgid "Gloss Level"
 msgstr "Fényesség szintje"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 msgid "Adjust the gloss level"
 msgstr "A fényesség szintjének beállítása"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr "Sötétsárga átmenet"
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr "Szürkeátmenet"
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Gray Transition"
 msgstr "Világosszürke-átmenet"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Dark Gray Transition"
 msgstr "Sötétszürke-átmenet"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 msgid "Mid Gray Transition"
 msgstr "Középsőszürke-átmenet"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 msgid "Medium Gray Transition"
 msgstr "Közepesszürke-átmenet"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 msgid "Full Manual Control"
 msgstr "Teljesen kézi vezérlés"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr "Automatikus beállításvezérlés"
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 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: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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Szabványos"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 msgid "Bidirectional"
 msgstr "Kétirányú"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 msgid "Unidirectional"
 msgstr "Egyirányú"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr "Alternatív kitöltés"
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr "Növekvő kitöltés"
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr "Csökkenő kitöltés"
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr "Növekvő dupla"
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr "Legközelebbi szomszéd elkerülése"
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, 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:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: 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"
@@ -1318,128 +1336,129 @@ msgid "test print"
 msgstr "próbanyomtatás"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 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: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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 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: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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 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: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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 msgid "Five Color Photo Composite"
 msgstr "Ötszínes fénykép (kompozit)"
 
-#: 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 msgstr "Fényes 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Borítékok"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "Matt papír"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "Inkjet papír"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotó minőségű Inkjet papír"
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "Fotópapír"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 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: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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Luster fotópapír"
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 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: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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr "Ilford-féle nehéz papír"
 
-#: 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Egyéb"
 
@@ -1455,50 +1474,50 @@ msgstr "Kézzel szünetekkel"
 msgid "Manual without Pause"
 msgstr "Kézzel szünetek nélkül"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr "Bevont"
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr "Nincs"
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 msgid "Glossy"
 msgstr "Fényes"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr "Textúra"
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 msgid "Matte"
 msgstr "Matt"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr "Laminált minta"
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 msgid "Adjust the cyan balance"
 msgstr "A ciánkék-egyensúly beállítása"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 msgid "Adjust the magenta balance"
 msgstr "A bíborvörös-egyensúly beállítása"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 msgid "Adjust the yellow balance"
 msgstr "A sárgaegyensúly beállítása"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 msgid "Black Balance"
 msgstr "Feketeegyensúly"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 msgid "Adjust the black balance"
 msgstr "A feketeegyensúly beállítása"
 
@@ -1610,8 +1629,8 @@ msgstr "Színes + fotó patronok"
 msgid "PPDFile"
 msgstr "PPD fájl"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 msgid "PPD File"
 msgstr "PPD fájl"
 
@@ -1619,264 +1638,270 @@ 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:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 msgid "Two Level Grayscale"
 msgstr "Kétszintű szürkeárnyalatos"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 msgid "Three Level Grayscale"
 msgstr "Háromszintű szürkeárnyalatos"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr "Hatszínes (továbbfejlesztett, kompozit)"
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 msgid "Seven Color Photo"
 msgstr "Hétszínes fénykép"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr "Hétszínes (továbbfejlesztett)"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 msgid "Eight Color Photo"
 msgstr "Nyolcszínes fénykép"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 msgid "One Color Raw"
 msgstr "Egyszínű nyers"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Egyszínű nyers (továbbfejlesztett fényesség)"
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 msgid "Two Color Raw"
 msgstr "Kétszínű nyers"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 msgid "Three Color Raw"
 msgstr "Háromszínű nyers"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 msgid "Three Color Raw Gloss"
 msgstr "Háromszínű nyers fényes"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 msgid "Four Color Raw"
 msgstr "Négyszínű nyers"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 msgid "Four Color Raw Gloss"
 msgstr "Négyszínű nyers fényes"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 msgid "Five Color Raw"
 msgstr "Ötszínes nyers"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 msgid "Six Color Raw"
 msgstr "Hatszínes nyers"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Hatszínes továbbfejlesztett, fényes nyers"
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 msgid "Seven Color Raw"
 msgstr "Hétszínes nyers"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Hétszínes továbbfejlesztett, fényes nyers"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 msgid "Eight Color Raw"
 msgstr "Nyolcszínes nyers"
 
-#: 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr "Epson szabvány tinták"
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome fotó fekete"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome matt fekete"
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 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
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 msgid "Light Black"
 msgstr "Világos fekete"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 msgid "Dark Yellow"
 msgstr "Sötétsárga"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 msgid "Gloss Optimizer"
 msgstr "Fényességoptimalizáló"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr "Egyszerű papír, gyors betöltéssel"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Levelezőlap"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr "Hátulról megvilágított film"
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 msgid "Matte Paper Heavyweight"
 msgstr "Matt papír, nehéz"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 msgid "Premium Semigloss Photo Paper"
 msgstr "Kiváló minőségű félig fényes fotópapír"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 msgid "ColorLife Paper"
 msgstr "ColorLife papír"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 msgid "Archival Matte Paper"
 msgstr "Archiválási matt papír"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr "Tekercses adagoló"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 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
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 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
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 msgid "Print to CD"
 msgstr "Nyomtatás CD-re"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 msgid "Manual Sheet Guide"
 msgstr "Kézi lapvezérlő"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 msgid "Manual Feed (Front)"
 msgstr "Kézi adagolás (elöl)"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 msgid "Rear Tray"
 msgstr "Hátsó tálca"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr "Első tálca"
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 msgid "Photo Board"
 msgstr "Fotókarton"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr "Vágólap, 1. tálca"
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr "Vágólap, 2. tálca"
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 msgid "Cut Sheet Autoselect"
 msgstr "Vágólap, automatikus tálcaválasztás"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr "Kézi kijelölés"
 
@@ -2738,3383 +2763,3562 @@ msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
 #: src/main/xmli18n-tmp.h:164
+#, fuzzy
+msgid "Canon BJC-5100"
+msgstr "Canon BJC-1000"
+
+#: src/main/xmli18n-tmp.h:165
+#, fuzzy
+msgid "Canon BJC-5500"
+msgstr "Canon BJC-6500"
+
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:173
+#, fuzzy
+msgid "Canon BJC-8500"
+msgstr "Canon BJC-6500"
+
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:181
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:182
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:183
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:184
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:189
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Epson Stylus CX3700"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Epson Stylus DX4200"
+
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 #, fuzzy
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 #, fuzzy
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 #, fuzzy
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Epson PM 700C"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Epson PM 780C"
+
+#: src/main/xmli18n-tmp.h:504
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 msgid "Generic PCL 4 Printer"
 msgstr "Általános PCL 4 nyomtató"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 msgid "Generic PCL 5 Printer"
 msgstr "Általános PCL 5 nyomtató"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 msgid "Generic PCL 5c Printer"
 msgstr "Általános PCL 5c nyomtató"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 msgid "Generic PCL 5e Printer"
 msgstr "Általános PCL 5e nyomtató"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Általános PCL 6/PCL XL nyomtató"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P PCL5 támogatással"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P PS támogatással"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+#, fuzzy
+msgid "HP LaserJet 1022"
+msgstr "HP LaserJet 1012"
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr "Okidata OL400"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr "Okidata OL400e"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr "Okidata OL410e"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr "Okidata OL600e"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr "Okidata OL800"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+#, fuzzy
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-161"
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 #, fuzzy
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+#, fuzzy
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:983
+#, fuzzy
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/main/xmli18n-tmp.h:985
+#, fuzzy
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/main/xmli18n-tmp.h:986
+#, fuzzy
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:987
+#, fuzzy
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:988
 #, fuzzy
 msgid "Sony DPP-EX5"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr "NYERS ADAT 16 bit"
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr "NYERS ADAT 8 bit"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "Hüvelyk"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "Az alapmértékegység hüvelykre állítása"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Az alapmértékegység centiméterre állítása"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Points"
 msgstr "Pont"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 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:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Az alapmértékegység milliméterre állítása"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 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:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "Színes kimenet"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 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:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Standard Command"
 msgstr "Szabványos parancs"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr "Szabványos nyomtatóparancs használata"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Custom Command"
 msgstr "Egyéni parancs"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr "Egyéni nyomtatóparancs használata"
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Fájl"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 msgid "Print to a file"
 msgstr "Nyomtatás fájlba"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr "Görbe szerkesztése..."
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 msgid "Set Default"
 msgstr "Alapértelmezés beállítása"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr "Előző helyreállítása"
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- nyomtatás v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "Névjegy"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6122,7 +6326,7 @@ msgstr ""
 "Nyomtatás és a\n"
 "beállítások mentése"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6130,15 +6334,15 @@ msgstr ""
 "Beállítások\n"
 "mentése"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Előnézet"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6163,73 +6367,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:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 msgid "Paper Size"
 msgstr "Papírméret"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr "Minden papírméret mutatása"
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Méretek:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Szélesség:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 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:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Magasság:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 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:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 msgid "Automatic Paper Size"
 msgstr "Automatikus papírméret"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr "Példányszám"
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 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:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 msgid "Image Position"
 msgstr "Képpozíció"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Automatikus"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Álló"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Fekvő"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "Fejjel lefelé"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Ellenkező fekvő"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6237,120 +6441,120 @@ msgstr ""
 "Válasszon irányt: álló, fekvő, fejjel lefelé levő vagy fordított fekvő "
 "(fejjel lefelé levő fekvő)"
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Elhelyezkedés:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Bal:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Jobb:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 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:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Fent:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 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:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Lent:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 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:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "Középre:"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Horizontal"
 msgstr "Vízszintes"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 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:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Mindkettő"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "A kép középre igazítása a papíron"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Vertical"
 msgstr "Függőleges"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 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:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Nyomtató beállítása"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 msgid "Printer Make:"
 msgstr "Nyomtató gyártója:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 msgid "Select the make of your printer"
 msgstr "Válassza ki a nyomtató gyártóját"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Nyomtató típusa:"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "Válassza ki a nyomtató típusát"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "PPD fájl:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 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:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Tallózás"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 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:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -6358,52 +6562,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:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 msgid "Printer Queue:"
 msgstr "Nyomtatási sor:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 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:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr "Adja meg a fájlt, amelybe nyomtatni kíván. "
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 msgid "File to print to"
 msgstr "Nyomtatás ebbe a fájlba"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 msgid "Print To File"
 msgstr "Nyomtatás fájlba"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "Új nyomtató meghatározása"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "Nyomtató neve:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 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:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 msgid "About Gutenprint "
 msgstr "A Gutenprint névjegye "
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 msgid "Gutenprint Version "
 msgstr "Gutenprint verzió: "
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Nyomtató beállításai"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6411,21 +6615,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:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "Nyomtató beállítása..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 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:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "Új nyomtató..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6433,23 +6637,32 @@ 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:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Alapértelmezések beállítása"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 msgid "Image Size"
 msgstr "Képméret"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Méretezés:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "Megadja a kép méretezését (méretét)"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr "Méretezés:"
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6457,31 +6670,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:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Százalék"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "Nyomat méretezése a lap mérete szerint"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 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:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "A nyomat szélessége"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "A nyomat magassága"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6489,66 +6702,66 @@ msgstr ""
 "Eredeti képméret\n"
 "használata"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 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:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "Nyomat színeinek beállítása"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Alapértelmezések beállítása"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Bezárás"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Előnézeti kép"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr "Kimeneti csatornák megjelenítése:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 msgid "Output"
 msgstr "Kimenet"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Kimenet típusa:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "Válassza ki a kívánt kimeneti típust"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "Kimenet beállítása..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 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:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 msgid "Size Units:"
 msgstr "Mértékegységek:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Mértékegységek:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "Válassza ki a nyomtatáshoz használt alapmértékegységet"
 
@@ -6581,11 +6794,11 @@ msgstr "Berkeley lpd (/usr/libexec/lpc)"
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 msgid "Printer"
 msgstr "Nyomtató"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 msgid "(Default Printer)"
 msgstr "(Alapértelmezett nyomtató)"
 
@@ -6633,85 +6846,85 @@ msgstr "Y maximális lehetséges értéke"
 msgid "_Gamma value"
 msgstr "_Gamma érték"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 msgid "Printer Features"
 msgstr "Nyomtató szolgáltatásai"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 msgid "Output Control"
 msgstr "Kimenetvezérlés"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 msgid "Common"
 msgstr "Közös"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 msgid "Extra 1"
 msgstr "1. extra"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 msgid "Extra 2"
 msgstr "2. extra"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 msgid "Extra 3"
 msgstr "3. extra"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 msgid "Extra 4"
 msgstr "4. extra"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Hungarian"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "ISOLatin2"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "Kétoldalas nyomtatás"
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr "Nem"
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr "Igen"
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 #, fuzzy
 msgid "Value"
 msgstr "Kék"
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr "Finomhangolás"
 
@@ -6789,17 +7002,17 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -6843,88 +7056,93 @@ msgid ""
 "    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Csak egy nyomtatót vagy nyers eszközt adhat meg."
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Csak egy nyomtatótípust adhat meg."
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr "Az igazítási választások értéke legalább 1 kell legyen."
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr "Az igazítási lépések értéke legallább 1 kell legyen."
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Ismeretlen kapcsoló: %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr "Használat: %s [KAPCSOLÓK] parancs\n"
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr "További információkért adja ki a(z) `%s --help' parancsot.\n"
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr "További információkért adja ki a(z) `%s -h' parancsot.\n"
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Nem lehet megnyitni a(z) %s eszközt: %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Nem lehet nyomtatni a(z) %s nyomtatóra ezzel: %s\n"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Nem lehet elküldeni a parancsot a nyomtatóra\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr "Az olvasás a nyomtatóról túllépte az időkorlátot\n"
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Nem lehet olvasni a következőről: %s: %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "A(z) %s nem nyitható meg írásra/olvasásra: %s\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Ismeretlen kapcsoló: %c\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "A(z) %s nem írható: %s\n"
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -6933,7 +7151,7 @@ msgstr ""
 "\n"
 "A(z) %s nem írható: %s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -6944,214 +7162,212 @@ msgstr ""
 "Nem lehet felismerni a nyomtató típusát.\n"
 "Használja az -m kapcsolót a nyomtató típusának megadásához.\n"
 
-#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr "Állapot: Hiba\n"
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Állapot: Önálló nyomtatás\n"
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Állapot: Foglalt\n"
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Állapot: Várakozás\n"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Állapot: Tétlen\n"
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Állapot: Szünetel\n"
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Állapot: Tisztítás\n"
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "Állapot: Gyári szállítás\n"
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Állapot: Leállítás\n"
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Állapot: Ismeretlen (%d)\n"
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Hiba: Végzetes hiba\n"
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Hiba: Másik csatoló van kiválasztva\n"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Hiba: A fedél nyitva\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Hiba: A papír elakadt\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Hiba: Elfogyott a tinta\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Hiba: Elfogyott a papír\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Hiba: Várakozás visszatérésre a letépési pozícióból\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Hiba: Dupla lapadagoló hiba\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr "Hiba: Helyreállíthatatlan vágóhiba\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr "Hiba: Helyreállítható vágóelakadás\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr "Hiba: A CD tálca kint\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Hiba: Kártyabetöltési hiba\n"
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr "Hiba: A tálcafedél nyitva\n"
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Hiba: Ismeretlen (%d)\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Fúvóka önteszt nyomtatása\n"
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Tintaszintek:\n"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 msgstr "Tinta színe"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "Hátralevő százalék"
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr "Figyelmeztetés: Kevés a fekete tinta\n"
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Figyelmeztetés: Ismeretlen (%d)\n"
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr "Feladat neve: "
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr "tintaszintek"
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr "állapot"
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "A(z) %s lekérése nyers eszközt igényel.\n"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "A kiterjesztett tintaadatok lekérése nyers eszközt igényel.\n"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr "Rész száma"
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr "Dátum"
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "A nyomtatóazonosítás nyers eszközt igényel.\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "A nyomtatótípus nem azonosítható.\n"
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Fejek tisztítása...\n"
@@ -7242,7 +7458,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Nem lehet elküldeni a parancsot a nyomtatóra, kilépés.\n"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr "Kilépés\n"
@@ -7268,7 +7484,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7354,7 +7570,7 @@ msgstr "Az utolsó parancsot nem erősítette meg.\n"
 #: src/escputil/escputil.c:1908
 #, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7362,12 +7578,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "Üssön enter-t a folytatáshoz > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7379,42 +7595,42 @@ msgstr ""
 "Adjon meg egy párszámot, a ?-et segítségért vagy az r-et a folyamat "
 "megismétléséhez.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "#%d. menet"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Helyezzen be egy üres lapot.\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "A szám kívül esik a tartományon!\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Nem értelmezhető, amit írt!\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "A legjobb sorpár száma 1 és %d között kell legyen.\n"
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Kísérlet az igazítás beállítására..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "sikeres.\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7423,7 +7639,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "Hiba a bemenetben\n"
diff --git a/po/ja.gmo b/po/ja.gmo
index ac5dbc4..391e327 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 15a5b02..6607541 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print Version 4.2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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"
@@ -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:1737
+#: src/main/print-escp2.c:1752
 #, fuzzy
 msgid "Default"
 msgstr "初期値に戻す"
@@ -82,16 +82,16 @@ msgstr ""
 msgid "Density"
 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -152,27 +152,27 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "ディザ方式"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -181,286 +181,287 @@ msgstr "画像のサイズ"
 msgid "Basic Printer Setup"
 msgstr "プリンタの設定"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "印刷する用紙のサイズです。"
 
-#: 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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "用紙の種類"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "給紙方法"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "印刷時の給紙方式です。"
 
-#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "用紙サイズを 100 とした場合の比率です。"
 
-#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "解像度"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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:252 src/main/print-escp2.c:238
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "プリンタの型式:"
 
-#: src/main/print-canon.c:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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:265 src/main/print-escp2.c:335
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "濃度:"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "印刷時のシアン色のバランスを調整します。"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "マゼンタ (M)"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "印刷時のマゼンタ色のバランスを調整します。"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "濃度:"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "印刷時の黄色のバランスを調整します。"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "濃度:"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "印刷時のシアン色のバランスを調整します。"
 
-#: 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-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 #, fuzzy
 msgid "Light Cyan Transition"
 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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "明るいマゼンタ"
 
-#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "明るいシアン"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "カスタム"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 #, fuzzy
 msgid "Print To Hub"
 msgstr "ファイルに印刷しますか？"
 
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "カラー"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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
@@ -501,9 +502,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "印刷"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "グレースケール"
 
@@ -590,7 +591,7 @@ msgid "Output image type"
 msgstr "出力の種類:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr ""
 
@@ -658,15 +659,16 @@ msgstr "ガンマ:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "シアン (C)"
 
@@ -675,15 +677,16 @@ msgstr "シアン (C)"
 msgid "Adjust the cyan gamma"
 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "マゼンタ (M)"
 
@@ -692,15 +695,16 @@ msgstr "マゼンタ (M)"
 msgid "Adjust the magenta gamma"
 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "黄色 (Y)"
 
@@ -709,10 +713,10 @@ msgstr "黄色 (Y)"
 msgid "Adjust the yellow gamma"
 msgstr "印刷時の黄色のバランスを調整します。"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr ""
 
@@ -721,8 +725,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "印刷時の黄色のバランスを調整します。"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr ""
 
@@ -731,10 +735,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "印刷時のマゼンタ色のバランスを調整します。"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr ""
 
@@ -744,14 +748,16 @@ 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "黒色"
 
@@ -760,7 +766,7 @@ msgstr "黒色"
 msgid "Adjust the black gamma"
 msgstr "印刷時のシアン色のバランスを調整します。"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr ""
 
@@ -775,7 +781,7 @@ msgstr "グレースケール"
 msgid "Adjust the cyan gray balance"
 msgstr "印刷時のシアン色のバランスを調整します。"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "マゼンタ (M)"
@@ -785,7 +791,7 @@ msgstr "マゼンタ (M)"
 msgid "Adjust the magenta gray balance"
 msgstr "印刷時のマゼンタ色のバランスを調整します。"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "印刷時の黄色のバランスを調整します。"
@@ -815,9 +821,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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "出力の種類:"
@@ -984,384 +990,395 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s は種類 %s に対する適切なパラメータではありません\n"
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "プリンタ %s が不明です\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s の範囲を越えました (現在の値 %d, 最小 %d, 最大 %d)\n"
 
-#: src/main/printers.c:761
+#: src/main/printers.c:772
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "画像サイズが正しくありません\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "上マージンは 0 より小さくしないで下さい\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:799
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "左マージンは 0 より小さくしないで下さい\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:805
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "左マージンは 0 より小さくしないで下さい\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "上マージンは 0 より小さくしないで下さい\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, 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:813
+#: src/main/printers.c:824
 #, 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: 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:228
+#: src/main/print-escp2.c:229
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "印刷時の解像度と品質です。"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 #, fuzzy
 msgid "Ink Set"
 msgstr "インクの種類"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 #, fuzzy
 msgid "Output Order"
 msgstr "出力の種類:"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 #, fuzzy
 msgid "Ink change command"
 msgstr "認識できないコマンドです。\n"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "間隔補正の設定を繰り返します。\n"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 #, fuzzy
 msgid "Channel Names"
 msgstr "取り消し"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Cyan Map"
 msgstr "シアン (C)"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "印刷時のシアン色のバランスを調整します。"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Magenta Map"
 msgstr "マゼンタ (M)"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "印刷時のマゼンタ色のバランスを調整します。"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Yellow Map"
 msgstr "黄色 (Y)"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "印刷時の黄色のバランスを調整します。"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Blue Map"
 msgstr "黒と白"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "印刷時のシアン色のバランスを調整します。"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "印刷時の黄色のバランスを調整します。"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "濃度:"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "印刷時の黄色のバランスを調整します。"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "濃度:"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "印刷時のシアン色のバランスを調整します。"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 #, fuzzy
 msgid "Gloss Level"
 msgstr "光沢付きフイルム"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "印刷時の黄色のバランスを調整します。"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "明るいシアン"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "明るいシアン"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "明るいシアン"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "明るいシアン"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "出力の種類:"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "標準"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 #, fuzzy
 msgid "Automatic"
 msgstr "画像のサイズ"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "プリンタはカラー印刷をサポートしていません\n"
 
-#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1415,128 +1432,129 @@ msgid "test print"
 msgstr "テスト印刷"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 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: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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 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: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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 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: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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 msgid "Five Color Photo Composite"
 msgstr "Five Color Photo Composite"
 
-#: 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "封筒"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "マット用紙"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "インクジェット用紙"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr "インクジェット用紙 (フォト用高品質)"
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "フォト用紙"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr "高級光沢付きフォト用紙"
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr "高級つや出しフォト用紙"
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr "光沢付き用紙 (フォト用高品質)"
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "その他"
 
@@ -1552,56 +1570,56 @@ msgstr "ポーズ付き手動給紙"
 msgid "Manual without Pause"
 msgstr "ポーズなし手動給紙"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 #, fuzzy
 msgid "Glossy"
 msgstr "光沢付きフイルム"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 #, fuzzy
 msgid "Matte"
 msgstr "マット用紙"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "印刷時のシアン色のバランスを調整します。"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "印刷時のマゼンタ色のバランスを調整します。"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "印刷時の黄色のバランスを調整します。"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 #, fuzzy
 msgid "Black Balance"
 msgstr "黒と白"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "印刷時のシアン色のバランスを調整します。"
@@ -1715,8 +1733,8 @@ msgstr "カラー + フォト・カートリッジ"
 msgid "PPDFile"
 msgstr "PPD ファイル:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD ファイルですか？"
@@ -1725,299 +1743,305 @@ msgstr "PPD ファイルですか？"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 msgid "Two Level Grayscale"
 msgstr "Two Level Grayscale"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "Two Level Grayscale"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr "Six Color Enhanced Composite"
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 msgid "Seven Color Photo"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr "Seven Color Enhanced"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Seven Color Enhanced"
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Four Color Standard"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Three Color Composite"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Three Color Composite"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Four Color Standard"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Four Color Standard"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Seven Color Photo"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six Color Enhanced Composite"
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Seven Color Enhanced"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Six Color Photo"
 
-#: 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 #, 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 #, 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 #, 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 #, fuzzy
 msgid "Light Magenta"
 msgstr "明るいマゼンタ"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 #, fuzzy
 msgid "Light Black"
 msgstr "黒色"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "黄色 (Y)"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "光沢付きフイルム"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 #, 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr "通常用紙の高速読込み"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "はがき"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr "バックライト・フィルム"
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "マット用紙"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "高級光沢付きフォト用紙"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "ColorLife Paper"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "マット用紙"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr "ロール式給紙"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 #, 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 #, fuzzy
 msgid "Print to CD"
 msgstr "ファイルに印刷しますか？"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "手動"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "手動"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 #, fuzzy
 msgid "Rear Tray"
 msgstr "トレイ"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 #, fuzzy
 msgid "Photo Board"
 msgstr "フォト用紙"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "自動選択"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr ""
 
@@ -2920,3557 +2944,3726 @@ msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon BJC-6000"
+msgid "Canon BJC-5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon BJC-6100"
+msgid "Canon BJC-5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon BJC-6200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon BJC-6500"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon BJC-7000"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "Canon BJC-7100"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "Canon BJC-8200"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "Canon S100"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "Canon S200"
+msgid "Canon BJC-8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "Canon S300"
+msgid "Canon BJC-8500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "Canon S400"
+msgid "Canon S100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "Canon S450"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "Canon S500"
+msgid "Canon S300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "Canon S600"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "Canon S630"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "Canon S800"
+msgid "Canon S500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "Canon S4500"
+msgid "Canon S600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "Canon PIXMA iP2000"
+msgid "Canon S630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "Canon PIXMA iP3000"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "Canon PIXMA iP3100"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "Canon PIXMA iP4000"
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "Canon PIXMA iP4100"
+msgid "Canon PIXMA iP3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "Canon PIXMA iP4200"
+msgid "Canon PIXMA iP3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:188
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:217
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:398
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:407
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:412
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:415
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:418
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:504
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "新しいプリンタの定義"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "新しいプリンタの定義"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "新しいプリンタの定義"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "新しいプリンタの定義"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+msgid "HP LaserJet 1022"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "プリンタ名:"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+msgid "Sharp AR-M257"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "プリンタの選択"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+msgid "Canon SELPHY-CP-720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:983
+msgid "Canon SELPHY-CP-740"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:985
+msgid "Canon SELPHY ES1"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:986
+msgid "Canon SELPHY ES2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:987
+msgid "Canon SELPHY ES20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:988
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "インチ"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "基本単位をインチにします。"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "センチメートル"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "基本単位をセンチメートルにします。"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Points"
 msgstr "印刷"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "基本単位をインチにします。"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "基本単位をセンチメートルにします。"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "基本単位をインチにします。"
 
-#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "カラーで印刷します。"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr "黒インクを使ってグレーの影を付けて印刷します。"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Standard Command"
 msgstr "標準"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Custom Command"
 msgstr "コマンド:"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "ファイル"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 #, fuzzy
 msgid "Print to a file"
 msgstr "ファイルに印刷しますか？"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 #, fuzzy
 msgid "Set Default"
 msgstr "初期値に戻す"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "取り消し"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- 印刷 v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "情報"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6478,7 +6671,7 @@ msgstr ""
 "印刷と\n"
 "設定の保存"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6486,15 +6679,15 @@ msgstr ""
 "設定の\n"
 "保存"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "印刷"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "プレビュー"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6517,279 +6710,279 @@ msgstr ""
 "を移動することが可能です。\n"
 "ドラッグ中に別のボタンをクリックすると、画像は元の場所に戻ります。"
 
-#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 #, fuzzy
 msgid "Paper Size"
 msgstr "画像のサイズ"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "寸法:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "幅:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 msgid "Width of the paper that you wish to print to"
 msgstr "印刷する用紙の幅です。"
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "高さ:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 msgid "Height of the paper that you wish to print to"
 msgstr "印刷する用紙の高さです。"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "画像のサイズ"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 #, fuzzy
 msgid "Image Position"
 msgstr "位置"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "自動"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "縦置き"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "横置き"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "上下"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "横長"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 "用紙の方向を選択します: 縦置き、横置き、上下、または横長 (上下つきの横置き)"
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "用紙の向き:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "左側:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the image"
 msgstr "用紙の左端から画像までの距離です。"
 
-#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "右側:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "用紙の左端から画像の右端までの距離です。"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 msgid "Distance from the right of the paper to the image"
 msgstr "用紙の右端から画像までの距離です。"
 
-#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "上側:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to the image"
 msgstr "用紙の上端から画像までの距離です。"
 
-#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "下側:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "用紙の上端から画像の下端までの距離です。"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 msgid "Distance from the bottom of the paper to the image"
 msgstr "用紙の下端から画像までの距離です。"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "中心:"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 #, fuzzy
 msgid "Horizontal"
 msgstr "水平"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "用紙の水平方向の中心にします。"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "両端"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "用紙の中心にします。"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 #, fuzzy
 msgid "Vertical"
 msgstr "垂直"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "用紙の垂直方向の中心にします。"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "プリンタの選択"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 #, fuzzy
 msgid "Printer Make:"
 msgstr "プリンタ名:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "お使いのプリンタを選択します。"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "プリンタの型式:"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "お使いのプリンタを選択します。"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "PPD ファイル:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr "お使いのプリンタ用の PPD ファイル名を入力します。"
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "参照"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr "お使いのプリンタ用の PPD ファイルを選択します。"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 #, fuzzy
 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:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "プリンタ名:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "お使いのプリンタ用の PPD ファイル名を入力します。"
 
-#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 #, fuzzy
 msgid "File to print to"
 msgstr "テスト印刷"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 #, fuzzy
 msgid "Print To File"
 msgstr "ファイルに印刷しますか？"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "新しいプリンタの定義"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "プリンタ名:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 msgid "Enter the name you wish to give this logical printer"
 msgstr "利用する論理プリンタ名を指定します。"
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Gimp-Print"
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print バージョン "
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "プリンタの設定"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 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:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "プリンタの選択..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr "プリンタの型式と PPD ファイル、印刷コマンドを選択します。"
 
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "新しいプリンタ..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6797,24 +6990,33 @@ msgstr ""
 "新規に論理プリンタを定義します。これは次回使用するために覚えておきたい設定名"
 "に使用されます。"
 
-#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "初期値に戻す"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 #, fuzzy
 msgid "Image Size"
 msgstr "画像のサイズ"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "拡大縮小:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "画像サイズの拡大縮小を行います。"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6822,31 +7024,31 @@ msgstr ""
 "拡大縮小の単位として、用紙サイズに対する百分率 (比率) か、ドット数/インチを選"
 "択します。"
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "比率"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "用紙サイズを 100 とした場合の比率です。"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr "画像のドット数/インチです。"
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "印刷時の幅をセットします。"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "印刷時の高さをセットします。"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6854,68 +7056,68 @@ msgstr ""
 "オリジナルの\n"
 "サイズの利用"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 msgid "Set the print size to the size of the image"
 msgstr "画像のオリジナル・サイズを印刷サイズにします。"
 
-#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "印刷カラー調整"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "初期値に戻す"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "閉じる"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "画像のプレビュー"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 #, fuzzy
 msgid "Output"
 msgstr "出力の種類:"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "出力の種類:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "出力する形態を選択します。"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "出力の調整..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "カラーバランス、明るさ、コントラスト、彩度とディザリング方式を調整します。"
 
-#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 #, fuzzy
 msgid "Size Units:"
 msgstr "単位:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "単位:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "印刷時の基本単位を選択します。"
 
@@ -6948,12 +7150,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 #, fuzzy
 msgid "Printer"
 msgstr "印刷"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "プリンタの選択"
@@ -7003,90 +7205,90 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 #, fuzzy
 msgid "Printer Features"
 msgstr "プリンタの設定"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Output Control"
 msgstr "出力の種類:"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 #, fuzzy
 msgid "Common"
 msgstr "コマンド:"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Extra 1"
 msgstr "トレイ１"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 2"
 msgstr "トレイ２"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 3"
 msgstr "トレイ３"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 4"
 msgstr "トレイ４"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Japanese"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "ISO ラテン１"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -7165,12 +7367,12 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
@@ -7217,7 +7419,7 @@ msgstr ""
 "    -m|--model         ヘッドを一列に並べるために、正確なプリンタの型式を指定"
 "する。\n"
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
@@ -7297,88 +7499,93 @@ msgstr ""
 "    -q バナーを表示しない。\n"
 "    -m ヘッドを一列に並べるために、正確なプリンタの型式を指定する。\n"
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "プリンタまたは低レベルのデバイスを一つ指定することが可能です。"
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "プリンタの型式を一つ指定することが可能です。"
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "不明なオプション %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "デバイス %s を開けません: %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "プリンタ %s に %s を使って印刷することができません\n"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "プリンタにコマンドを送信できません\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "%s から読み込めません: %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "低レベル・デバイスを利用するためにプリンタの状態が必要です。\n"
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "%s を読み書きモードで開けません: %s\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "不明なオプション %s です\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "%s に書き込めません; %s\n"
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7387,7 +7594,7 @@ msgstr ""
 "\n"
 "%s に書き込めません: %s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7398,214 +7605,212 @@ msgstr ""
 "プリンタの型式を検出できませんでした。\n"
 "お使いのプリンタを特定するために '-m' オプションを使用して下さい。\n"
 
-#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "彩度:"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "入力エラー\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "入力エラー\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "残りの割合"
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "低レベル・デバイスを利用するために必要なインク・レベルを取得します。\n"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "低レベル・デバイスを利用するために必要なインク・レベルを取得します。\n"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "低レベル・デバイスを利用するためにプリンタ識別子が必要です。\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "プリンタの型式を一つ指定することが可能です。"
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "ヘッドの清掃中...\n"
@@ -7764,7 +7969,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "プリンタにコマンドを送信できません。終了します。\n"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr ""
@@ -7790,7 +7995,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7877,9 +8082,9 @@ msgid "Final command was not confirmed.\n"
 msgstr "最後のコマンドが確認されていません。\n"
 
 #: src/escputil/escputil.c:1908
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7893,12 +8098,12 @@ msgstr ""
 "印刷ヘッド間隔補正を開始する場合は、プリンタのトレイに\n"
 "用紙を入れて下さい。\n"
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "何かキーを入力すると続行します > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7909,42 +8114,42 @@ msgstr ""
 "そのペアの番号を入力か、'r' でこの設定をくりかえすか、'?' でヘルプを表示しま"
 "す。\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "パス #%d"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "新しい用紙をトレイに入れて下さい。\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "範囲外のペア番号です！\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "入力したものは無効です！\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "最適なラインのペアは 1 と %d の間の番号にして下さい。\n"
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "間隔補正中..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "完了しました。\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7957,7 +8162,7 @@ msgstr ""
 "もし最適なパターンでない場合は、最適な印刷品質を得るために\n"
 "同様の操作を繰り返して下さい。\n"
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "入力エラー\n"
@@ -8982,6 +9187,3 @@ msgstr "%.0f で次の低レベルフィールドを取得します\n"
 
 #~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n"
 #~ msgstr "パラメータ %s は範囲外です (値 %d, 最小値 %d, 最大値 %d)\n"
-
-#~ msgid "Unknown option %s\n"
-#~ msgstr "不明なオプション %s です\n"
diff --git a/po/nb.gmo b/po/nb.gmo
index 7a4ac10..17bbe91 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 0bd74c0..aa09cb8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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"
@@ -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:1737
+#: src/main/print-escp2.c:1752
 #, fuzzy
 msgid "Default"
 msgstr "Sett til standardverdier"
@@ -79,16 +79,16 @@ msgstr ""
 msgid "Density"
 msgstr "Tetthet:"
 
-#: 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -138,27 +138,27 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -167,281 +167,282 @@ msgstr "Størrelse"
 msgid "Basic Printer Setup"
 msgstr "Innstillinger for parametere"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Bredde på papiret du skal skrive ut på"
 
-#: 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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "Medietype"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "Mediekilde"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Skaler utskriften til størrelsen på papiret"
 
-#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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"
 
-#: 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-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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:265 src/main/print-escp2.c:335
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr ""
 
-#: 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-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: 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: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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: 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:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Egendefinert"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut til fil?"
 
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Farger"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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
@@ -482,9 +483,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Gråtoner"
 
@@ -571,7 +572,7 @@ msgid "Output image type"
 msgstr "Utskriftstype:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr ""
 
@@ -635,15 +636,16 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -651,15 +653,16 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -667,15 +670,16 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Gul"
 
@@ -683,10 +687,10 @@ msgstr "Gul"
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr ""
 
@@ -694,8 +698,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr ""
 
@@ -703,10 +707,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr ""
 
@@ -715,14 +719,16 @@ 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Sort"
 
@@ -730,7 +736,7 @@ msgstr "Sort"
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr ""
 
@@ -744,7 +750,7 @@ msgstr "Gråtoner"
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -753,7 +759,7 @@ msgstr "Magenta"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Gul"
@@ -780,9 +786,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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Utskriftstype:"
@@ -949,373 +955,384 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s er ikke en gyldig dither-algoritme\n"
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Ukjent skriver %s\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, 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"
 
-#: src/main/printers.c:761
+#: src/main/printers.c:772
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Bildestørrelsen er ikke gyldig\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Toppmargen må ikke være mindre enn null\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:799
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Venstre marg må ikke være mindre enn null\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:805
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Venstre marg må ikke være mindre enn null\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Toppmargen må ikke være mindre enn null\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, 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:813
+#: src/main/printers.c:824
 #, 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr ""
 
-#: src/main/print-escp2.c:228
+#: src/main/print-escp2.c:229
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Oppløsning og kvalitet på utskriften"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 #, fuzzy
 msgid "Ink Set"
 msgstr "Blekktype"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 #, fuzzy
 msgid "Output Order"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 #, fuzzy
 msgid "Ink change command"
 msgstr "Kommandoen ble ikke gjenkjent.\n"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Gjentar justeringsprosessen.\n"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 #, fuzzy
 msgid "Channel Names"
 msgstr "Avbryt"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Cyan"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Gul"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Blue Map"
 msgstr "Sort-hvitt"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glanset film"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utskriftstype:"
 
-#: 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 #, fuzzy
 msgid "Automatic"
 msgstr "Størrelse"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Skriver støtter ikke fargeutskrift\n"
 
-#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1369,128 +1386,129 @@ msgid "test print"
 msgstr "testutskrift"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: 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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 msgstr "Glanset 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Konvolutter"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "Matt papir"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "Papir for blekkskriver"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papir med fotokvalitet for blekkskriver"
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Annet"
 
@@ -1506,53 +1524,53 @@ msgstr "Manuell med pause"
 msgid "Manual without Pause"
 msgstr "Manuell uten pause"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 #, fuzzy
 msgid "Glossy"
 msgstr "Glanset film"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 #, fuzzy
 msgid "Matte"
 msgstr "Matt papir"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 #, fuzzy
 msgid "Black Balance"
 msgstr "Sort-hvitt"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -1665,8 +1683,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "PPD fil:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD/Fil?"
@@ -1675,302 +1693,308 @@ msgstr "PPD/Fil?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Gråtoner"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "Gråtoner"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 #, fuzzy
 msgid "Seven Color Enhanced"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Farge"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Farge"
 
-#: 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 #, 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 #, 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 #, 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 #, fuzzy
 msgid "Light Black"
 msgstr "Sort"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gul"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glanset film"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 #, 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 #, fuzzy
 msgid "Plain Paper Fast Load"
 msgstr "Vanlig papir"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postkort"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matt papir"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Glanset fotopapir"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Vanlig papir"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matt papir"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 #, 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 #, fuzzy
 msgid "Print to CD"
 msgstr "Skriv ut til fil?"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manuell"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manuell"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Skuff"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 #, fuzzy
 msgid "Photo Board"
 msgstr "Fotopapir"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Autovelg"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr ""
 
@@ -2869,3557 +2893,3726 @@ msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon BJC-6000"
+msgid "Canon BJC-5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon BJC-6100"
+msgid "Canon BJC-5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon BJC-6200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon BJC-6500"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon BJC-7000"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "Canon BJC-7100"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "Canon BJC-8200"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "Canon S100"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "Canon S200"
+msgid "Canon BJC-8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "Canon S300"
+msgid "Canon BJC-8500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "Canon S400"
+msgid "Canon S100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "Canon S450"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "Canon S500"
+msgid "Canon S300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "Canon S600"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "Canon S630"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "Canon S800"
+msgid "Canon S500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "Canon S4500"
+msgid "Canon S600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "Canon PIXMA iP2000"
+msgid "Canon S630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "Canon PIXMA iP3000"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "Canon PIXMA iP3100"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "Canon PIXMA iP4000"
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "Canon PIXMA iP4100"
+msgid "Canon PIXMA iP3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "Canon PIXMA iP4200"
+msgid "Canon PIXMA iP3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:188
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:217
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 770"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:398
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:407
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:412
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:415
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:418
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:504
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+msgid "HP LaserJet 1022"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Skrivernavn:"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+msgid "Sharp AR-M257"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Sett opp skriver"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+msgid "Canon SELPHY-CP-720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:983
+msgid "Canon SELPHY-CP-740"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:985
+msgid "Canon SELPHY ES1"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:986
+msgid "Canon SELPHY ES2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:987
+msgid "Canon SELPHY ES20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:988
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "Tomme"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "Sett basis måleenhet til tommer"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Sett basis måleenhet til centimeter"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Points"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Sett basis måleenhet til tommer"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Sett basis måleenhet til centimeter"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Sett basis måleenhet til tommer"
 
-#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "Fargeutskrift"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standard"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Custom Command"
 msgstr "Kommando:"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Fil"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 #, fuzzy
 msgid "Print to a file"
 msgstr "Skriv ut til fil?"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 #, fuzzy
 msgid "Set Default"
 msgstr "Sett til standardverdier"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Skriv ut v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "Om"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6427,7 +6620,7 @@ msgstr ""
 "Skriv ut og\n"
 "lagre innstillinger"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6435,15 +6628,15 @@ msgstr ""
 "Lagre\n"
 "innstillinger"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6457,330 +6650,339 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 #, fuzzy
 msgid "Paper Size"
 msgstr "Størrelse"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Størrelse:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Bredde:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 msgid "Width of the paper that you wish to print to"
 msgstr "Bredde på papiret du skal skrive ut på"
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Høyde:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 msgid "Height of the paper that you wish to print to"
 msgstr "Høyde på papiret du skal skrive ut på"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Størrelse"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 #, fuzzy
 msgid "Image Position"
 msgstr "Posisjon"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Portrett"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Landskap"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "Opp-ned"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Landskap"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Venstre:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the image"
 msgstr "Avstand fra venstre kant av arket til bildet"
 
-#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Høyre:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 msgid "Distance from the right of the paper to the image"
 msgstr "Avstand fra høyre kant av arket til bildet"
 
-#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Øverst:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to the image"
 msgstr "Avstand fra toppen av arket til bildet"
 
-#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Nederst:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 #, 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:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Avstand fra nedre kant av arket til bildet"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "Sentrer:"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horisontalt"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "Sentrer bildet horisontalt på arket"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Begge"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "Sentrer bildet på arket"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertikalt"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "Sentrer bildet vertikalt på arket"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Sett opp skriver"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Skrivernavn:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Velg din skrivermodell"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Raskt heltall"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "Velg din skrivermodell"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "PPD fil:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Skriv inn korrekt PPD-filnavn for din skriver"
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Bla gjennom"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Velg korrekt PPD-filnavn for din skriver"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 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:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Skrivernavn:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Skriv inn korrekt PPD-filnavn for din skriver"
 
-#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 #, fuzzy
 msgid "File to print to"
 msgstr "testutskrift"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 #, fuzzy
 msgid "Print To File"
 msgstr "Skriv ut til fil?"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "Definer ny skriver"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "Skrivernavn:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Skriv inn navnet du ønsker å gi til denne logiske skriveren"
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Om Gimp-Print"
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print versjon "
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Innstillinger for parametere"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 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:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "Sett opp skriver..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "Ny skriver..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 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:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Sett til standardverdier"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 #, fuzzy
 msgid "Image Size"
 msgstr "Størrelse"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Skalering"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "Sett skalering (størrelse) på bildet"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Prosent"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "Skaler utskriften til størrelsen på papiret"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr "Skaler utskriften til antall punkter per tomme"
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "Sett bredde på utskriften"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "Sett høyde for utskriften"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6788,67 +6990,67 @@ msgstr ""
 "Bruk opprinnelig\n"
 "bildestørrelse"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 msgid "Set the print size to the size of the image"
 msgstr "Sett størrelsen på utskriften til størrelsen på bildet"
 
-#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Sett til standardverdier"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Lukk"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Forhåndsvisning av bilde"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 #, fuzzy
 msgid "Output"
 msgstr "Utskriftstype:"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Utskriftstype:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "Velg ønsket type for utdata"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "Juster utskrift..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 #, fuzzy
 msgid "Size Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 #, fuzzy
 msgid " "
 msgstr ">"
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "Velg basis måleenhet for utskrift"
 
@@ -6881,12 +7083,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 #, fuzzy
 msgid "Printer"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Sett opp skriver"
@@ -6936,90 +7138,90 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 #, fuzzy
 msgid "Printer Features"
 msgstr "Innstillinger for parametere"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Output Control"
 msgstr "Utskriftstype:"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 #, fuzzy
 msgid "Common"
 msgstr "Kommando:"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Extra 1"
 msgstr "Skuff 1"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 2"
 msgstr "Skuff 2"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 3"
 msgstr "Skuff 3"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 4"
 msgstr "Skuff 4"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Norwegian"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -7082,17 +7284,17 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -7136,88 +7338,93 @@ msgid ""
 "    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Du kan kun spesifisere én skriver eller rå enhet."
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Du kan kun oppgi én skrivermodell."
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Ukjent flagg %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Kan ikke åpne enhet %s: %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Kan ikke skrive til skriver %s med %s\n"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Kan ikke sende kommando til skriver\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan ikke lese fra %s: %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "Skriverstatus krever bruk av en rå enhet.\n"
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Ukjent flagg %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7226,7 +7433,7 @@ msgstr ""
 "\n"
 "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7237,214 +7444,212 @@ msgstr ""
 "Kan ikke finne skrivertype.\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
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Metning:"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "Feil i inndata\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "Feil i inndata\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 msgstr "Blekkfarge"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "Prosent gjenstående"
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, 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"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Du må bruke en rå enhet for å identifisere skriveren.\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Du kan kun oppgi én skrivermodell."
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Renser hoder...\n"
@@ -7534,7 +7739,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Kan ikke sende kommando til skriveren, avslutter.\n"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr ""
@@ -7553,7 +7758,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr ">"
 
@@ -7637,7 +7842,7 @@ msgstr "Siste kommando ble ikke bekreftet.\n"
 #: src/escputil/escputil.c:1908
 #, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7645,12 +7850,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "Trykk linjeskift for å fortsette > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7658,42 +7863,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "Gjennomgang #%d"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Vennligst sett inn et nytt ark.\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Tallet er utenfor gyldig område!\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Kan ikke forstå det du skrev inn!\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Prøver å sette justering..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "fullført.\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7702,7 +7907,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "Feil i inndata\n"
@@ -8514,6 +8719,3 @@ msgstr "Henting av neste rad feilet ved %.0f\n"
 
 #~ msgid "Yellow:"
 #~ msgstr "Gul:"
-
-#~ msgid "Unknown option %s\n"
-#~ msgstr "Ukjent flagg %s\n"
diff --git a/po/nl.gmo b/po/nl.gmo
index 4f7f954..d4cfcc0 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index a08264a..f63d30c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-17 11:45-0400\n"
-"PO-Revision-Date: 2007-02-09 00:52+0100\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\n"
+"PO-Revision-Date: 2007-12-01 21:53-0500\n"
 "Last-Translator: Freek de Kruijf <f.de.kruijf@hetnet.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\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:1737
+#: src/main/print-escp2.c:1752
 msgid "Default"
 msgstr "Standaard"
 
@@ -78,18 +78,18 @@ msgstr "Invoer met toegepast ruis-algoritme"
 
 #: src/main/dither-main.c:88 src/main/print-color.c:56
 msgid "Density"
-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
+msgstr "Hoeveelheid"
+
+#: src/main/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -149,26 +149,26 @@ msgstr "Kleurconversie-module"
 msgid "Dither algorithm"
 msgstr "Ruis-algoritme"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -176,271 +176,272 @@ msgstr "Paginagrootte"
 msgid "Basic Printer Setup"
 msgstr "Printerinstellingen"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: 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: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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "Type medium"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "Bronmedium"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr "Afmeting CD-printdeel"
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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:222 src/main/print-escp2.c:203
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 #, fuzzy
 msgid "CD Hub Size (Custom)"
 msgstr "Afmeting CD-printdeel"
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, fuzzy
 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:234 src/main/print-escp2.c:215
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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:235 src/main/print-canon.c:241
-#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 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:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 msgid "CD Vertical Fine Adjustment"
 msgstr "Vertikale fijnafstelling van 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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:252 src/main/print-escp2.c:238
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Type inkt"
 
-#: 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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr "Geavanceerde functionaliteit van de printer"
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Wijze van printen"
 
-#: src/main/print-canon.c:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Hoofdparameters"
 
-#: 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-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Manier van printen"
 
-#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "Dubbelzijdig printen"
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Omkeer stand"
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 msgid "Cyan Density"
 msgstr "Hoeveelheid cyaan"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: 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:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 msgid "Magenta Density"
 msgstr "Hoeveelheid magenta"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: 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:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 msgid "Yellow Density"
 msgstr "Heoveelheid geel"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: 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:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 msgid "Black Density"
 msgstr "Hoeveelheid zwart"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr "Pas de hoeveelheid zwart aan"
 
-#: 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-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 msgid "Light Cyan Transition"
 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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr "Geavanceerde aanpassing van de inkt"
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 msgid "Light Magenta Transition"
 msgstr "Lichtmagenta overgang"
 
-#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 msgid "Light Yellow Transition"
 msgstr "Lichtgeel overgang"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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 "Uit"
 
-#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr "Lange zijde (standaard)"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr "Korte zijde (omslaan)"
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "CD - 5 inch"
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "CD - 3 inch"
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Gebruiker"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 msgid "Print To Hub"
 msgstr "Afdrukken naar tussenstation"
 
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Kleur"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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"
@@ -478,9 +479,9 @@ msgstr "Raw"
 msgid "Pre-Dithered"
 msgstr "Voorbehandeld met ruis-algoritme"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Grijsschaal"
 
@@ -560,13 +561,13 @@ msgid "Output image type"
 msgstr "Beeldtype van de uitvoer"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr "Raw-kanalen"
 
 #: src/main/print-color.c:216
 msgid "SimpleGamma"
-msgstr "Envoudige gamma:"
+msgstr "Envoudige gamma"
 
 #: src/main/print-color.c:217
 msgid "Do not correct for screen gamma"
@@ -620,15 +621,16 @@ msgstr "AppGamma"
 msgid "Gamma value assumed by application"
 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Cyaan"
 
@@ -636,15 +638,16 @@ msgstr "Cyaan"
 msgid "Adjust the cyan gamma"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -652,15 +655,16 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Geel"
 
@@ -668,10 +672,10 @@ msgstr "Geel"
 msgid "Adjust the yellow gamma"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr "Rood"
 
@@ -679,8 +683,8 @@ msgstr "Rood"
 msgid "Adjust the red gamma"
 msgstr "Pas de hoeveelheid rood aan"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr "Groen"
 
@@ -688,10 +692,10 @@ msgstr "Groen"
 msgid "Adjust the green gamma"
 msgstr "Pas de hoeveelheid groen aan"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr "Blauw"
 
@@ -700,14 +704,16 @@ msgid "Adjust the blue gamma"
 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Zwart"
 
@@ -715,7 +721,7 @@ msgstr "Zwart"
 msgid "Adjust the black gamma"
 msgstr "Pas de hoeveelheid zwart aan"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr "Cyaanwaarde"
 
@@ -728,7 +734,7 @@ msgstr "Grijswaarde"
 msgid "Adjust the cyan gray balance"
 msgstr "Pas de cyaan-grijs balans aan"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 msgid "Magenta Balance"
 msgstr "Magentawaarde"
 
@@ -736,7 +742,7 @@ msgstr "Magentawaarde"
 msgid "Adjust the magenta gray balance"
 msgstr "Pas de hoeveelheid magenta-grijs aan"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 msgid "Yellow Balance"
 msgstr "Geelwaarde"
 
@@ -763,9 +769,9 @@ 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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 msgid "Advanced Output Control"
 msgstr "Geavanceerde controle van uitvoer"
 
@@ -914,77 +920,77 @@ msgstr "Grijscomponent-verminderingskromme"
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditionele Gutenprint kleurconversie"
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Waarde moet ingesteld worden voor %s\n"
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "`%s' is geen juiste %s\n"
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s moet liggen tussen %f en %f (is %f)\n"
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s moet liggen tussen %d en %d (is %d)\n"
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "grenzen van %s moeten liggen tussen %f en %f\n"
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "%s doorloop-modus moet zijn %s\n"
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr "niet doorlopen (op de volgende regel)"
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr "doorlopen (op de volgende regel)"
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Onbekende type parameter %s (%d)\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, 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:761
+#: src/main/printers.c:772
 msgid "Page size is not valid\n"
 msgstr "Paginagrootte is niet geldig\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Bovenmarge mag niet minder dan %d zijn\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:799
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Linkermarge mag niet minder dan %d zijn\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:805
 msgid "Height must be greater than zero\n"
 msgstr "Hoogte moet groter dan nul zijn\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 msgid "Width must be greater than zero\n"
 msgstr "Breedte moet groter dan nul zijn\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -993,7 +999,7 @@ msgstr ""
 "Afbeelding is te breed voor de pagina: linkermarge is %d, breedte %d, "
 "rechterrand is %d\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:824
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1002,268 +1008,280 @@ msgstr ""
 "Afbeelding is te lang voor de pagina: bovenmarge is %d, hoogte %d, onderrand "
 "is %d\n"
 
-#: src/main/print-escp2.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr "Automatische printmodus"
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr "Basis uitvoeraanpassing"
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr "Automatische printmodus"
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Printkwaliteit"
 
-#: src/main/print-escp2.c:228
+#: src/main/print-escp2.c:229
 msgid "Resolution of the print"
 msgstr "Resolutie van de afdruk"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr "Verhoogde glans"
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr "Voeg glansverhoging toe"
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 msgid "Ink Set"
 msgstr "Inktsetje"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Richting van het afdrukken"
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr "Geavanceerde aanpassing van uitvoer"
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 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:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr "Zonder randen"
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr "Afdrukken zonder randen"
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Interleave methode"
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr "Te gebruiken interleave patroon"
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr "Pas de puntgrootte aan"
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr "Pas de puntgrootte aan om de gewenste dichtheid te verkrijgen"
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 msgid "Output Order"
 msgstr "Volgorde van uitvoer"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr "Uitlijnstappen"
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr "Uitlijnkeuzes"
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 msgid "Ink change command"
 msgstr "Inkt verandercommando"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr "Wissel uitlijnstappen af"
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 msgid "Alternate Alignment Choices"
 msgstr "Wissel de uitlijnkeuzes"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr "Ondersteunt pakketmodus"
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+#, fuzzy
+msgid "Supports D4 Packet Mode"
+msgstr "Ondersteunt pakketmodus"
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 msgid "Channel Names"
 msgstr "Kanaalnamen"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr "Aantal raw-kanalen"
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 msgid "Cyan Map"
 msgstr "Cyaankaart"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 msgid "Adjust the cyan map"
 msgstr "Pas de cyaankaart aan"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 msgid "Magenta Map"
 msgstr "Magentakaart"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 msgid "Adjust the magenta map"
 msgstr "Pas de magentakaart aan"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 msgid "Yellow Map"
 msgstr "Geelkaart"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 msgid "Adjust the yellow map"
 msgstr "Pas de geelkaart aan"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 msgid "Blue Map"
 msgstr "Blauwkaart"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 msgid "Adjust the blue map"
 msgstr "Pas de blauwkaart aan"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr "Roodkaart"
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 msgid "Adjust the red map"
 msgstr "Pas de roodkaart aan"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr "Hoeveelheid rood"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr "Pas de hoeveelheid rood aan"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr "Hoeveelheid blauw"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr "Pas de hoeveelheid blauw aan"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 msgid "Gloss Level"
 msgstr "Glansniveau"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 msgid "Adjust the gloss level"
 msgstr "Pas het glansniveau aan"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr "Donkergeel overgang"
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr "Grijs overgang"
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Gray Transition"
 msgstr "Lichtgrijs overgang"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Dark Gray Transition"
 msgstr "Donkergrijs overgang"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 msgid "Mid Gray Transition"
 msgstr "Middelgrijs overgang"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 msgid "Medium Gray Transition"
 msgstr "Middelgrijs overgang"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 msgid "Full Manual Control"
 msgstr "Volledig handmatige controle"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr "Automatische controle op instellingen"
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Standaard"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 msgid "Bidirectional"
 msgstr "Bidirectioneel"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 msgid "Unidirectional"
 msgstr "Unidirectioneel"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr "Afwisselend opvullen"
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr "Oplopend vullen"
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr "Aflopend vullen"
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr "Dubbel oplopend"
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr "Vermijden van naaste buur"
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Deze printer ondersteunt geen 'raw' printuitvoer op de diepte %d\n"
 
-#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print opties niet geverifiëerd; kan niet printen.\n"
@@ -1317,128 +1335,129 @@ msgid "test print"
 msgstr "Test afdruk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 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: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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 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: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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 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: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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 msgid "Five Color Photo Composite"
 msgstr "Vijf kleuren foto composiet"
 
-#: 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 msgstr "Glanzende laag"
 
-#: 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Enveloppen"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "Mat papier"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "Inkjet-papier"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokwaliteit Inkjet-papier"
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "Fotopapier"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium glanzend fotopapier"
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Luster Photo Papier"
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokwaliteit glanzend papier"
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Overige"
 
@@ -1454,50 +1473,50 @@ msgstr "Handmatig met pauze"
 msgid "Manual without Pause"
 msgstr "Handmatig zonder pauze"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr "Gecoat"
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr "Geen"
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 msgid "Glossy"
 msgstr "Glanzend"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr "Oppervlaktestructuur"
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 msgid "Matte"
 msgstr "Mat"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr "Laagjespatroon"
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 msgid "Adjust the cyan balance"
 msgstr "Pas de cyaanbalans aan"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 msgid "Adjust the magenta balance"
 msgstr "Pas de magentabalans aan"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 msgid "Adjust the yellow balance"
 msgstr "Pas de geelbalans aan"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 msgid "Black Balance"
 msgstr "Zwartbalans"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 msgid "Adjust the black balance"
 msgstr "Pas de zwartbalans aan"
 
@@ -1609,8 +1628,8 @@ msgstr "Kleur + Foto patronen"
 msgid "PPDFile"
 msgstr "PPD-bestand"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 msgid "PPD File"
 msgstr "PPD-bestand"
 
@@ -1619,264 +1638,270 @@ msgid "Image dimensions must match paper dimensions"
 msgstr ""
 "Afmeting van afbeelding moet overeenkomen met de afmetingen van het papier"
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 msgid "Two Level Grayscale"
 msgstr "Grijsschaal met twee waarden"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 msgid "Three Level Grayscale"
 msgstr "Grijsschaal met drie waarden"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr "Viertonig"
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr "Zes kleuren verbeterde samenstelling"
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 msgid "Seven Color Photo"
 msgstr "Zevenkleuren foto"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr "Zeven kleuren verbeterd"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 msgid "Eight Color Photo"
 msgstr "Achtkleuren foto"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 msgid "One Color Raw"
 msgstr "Enkelkleur 'raw'"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Enkelkleur 'raw' verbeterde glans"
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 msgid "Two Color Raw"
 msgstr "Tweekleuren 'raw'"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 msgid "Three Color Raw"
 msgstr "Driekleuren 'raw'"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 msgid "Three Color Raw Gloss"
 msgstr "Driekleuren 'raw' glanzend"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 msgid "Four Color Raw"
 msgstr "Vierkleuren 'raw'"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 msgid "Four Color Raw Gloss"
 msgstr "Vierkleuren 'raw' glanzend"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 msgid "Five Color Raw"
 msgstr "Vijfkleuren 'raw'"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 msgid "Six Color Raw"
 msgstr "Zeskleuren 'raw'"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Zeskleuren verbeterde glans 'raw'"
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 msgid "Seven Color Raw"
 msgstr "Zevenkleuren 'raw'"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Zevenkleuren verbeterde glans 'raw'"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 msgid "Eight Color Raw"
 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr "EPSON standaard inkt"
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome Photo Black"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 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
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 msgid "Light Cyan"
 msgstr "Lichtcyaan"
 
-#: 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 msgid "Light Magenta"
 msgstr "Lichtmagenta"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 msgid "Light Black"
 msgstr "Grijs"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 msgid "Dark Yellow"
 msgstr "Donkergeel"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 msgid "Gloss Optimizer"
 msgstr "Glansverbeteraar"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr "Blanco papier snellader"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Briefkaart"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr "Backlight film"
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 msgid "Matte Paper Heavyweight"
 msgstr "Zwaar mat papier"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium halfglanzend fotopapier"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 msgid "ColorLife Paper"
 msgstr "ColorLife papier"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 msgid "Archival Matte Paper"
 msgstr "Archief mat papier"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 msgid "Watercolor Paper - Radiant White"
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr "Rolinvoer"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 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
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 msgid "Roll Feed (do not cut)"
 msgstr "Aanvoer vanaf rol (niet afsnijden)"
 
-#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 msgid "Print to CD"
 msgstr "Afdrukken naar CD"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 msgid "Manual Sheet Guide"
 msgstr "Handmatige papiergeleider"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 msgid "Manual Feed (Front)"
 msgstr "Handmatige toevoer (voorzijde)"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 msgid "Rear Tray"
 msgstr "Lade aan achterzijde"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr "Lade aan voorzijde"
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 msgid "Photo Board"
 msgstr "Fotobord"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr "Lade 1 voor vellen"
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr "Lade 2 voor vellen"
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 msgid "Cut Sheet Autoselect"
 msgstr "Automatisch selecteren van vellen"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr "Handmatig selecteren"
 
@@ -2738,3383 +2763,3562 @@ msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
 #: src/main/xmli18n-tmp.h:164
+#, fuzzy
+msgid "Canon BJC-5100"
+msgstr "Canon BJC-1000"
+
+#: src/main/xmli18n-tmp.h:165
+#, fuzzy
+msgid "Canon BJC-5500"
+msgstr "Canon BJC-6500"
+
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:173
+#, fuzzy
+msgid "Canon BJC-8500"
+msgstr "Canon BJC-6500"
+
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:181
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:182
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:183
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:184
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:189
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Epson Stylus CX3700"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Epson Stylus DX4200"
+
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 #, fuzzy
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 #, fuzzy
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 #, fuzzy
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Epson PM 700C"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Epson PM 780C"
+
+#: src/main/xmli18n-tmp.h:504
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+#, fuzzy
+msgid "HP LaserJet 1022"
+msgstr "HP LaserJet 1012"
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr "Okidata OL400"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr "Okidata OL400e"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr "Okidata OL410e"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr "Okidata OL600e"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr "Okidata OL800"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+#, fuzzy
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-161"
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 #, fuzzy
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+#, fuzzy
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:983
+#, fuzzy
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/main/xmli18n-tmp.h:985
+#, fuzzy
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/main/xmli18n-tmp.h:986
+#, fuzzy
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:987
+#, fuzzy
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:988
 #, fuzzy
 msgid "Sony DPP-EX5"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "Inch"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "Stel de basis-meeteenheid in op inches"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Stel de basis-meeteenheid in op centimeter"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Points"
 msgstr "Punten"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Stel de basis-meeteenheid in op punten (1/72\")"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Stel de basis-meeteenheid in op millimeter"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Stel de basis-meeteenheid in op pica (1/12\")"
 
-#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "Kleuruitvoer"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr "Print in grijstinten met zwarte inkt"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Standard Command"
 msgstr "Standaard commando"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr "Gebruik het standaard printcommando"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Custom Command"
 msgstr "Fabrikaat specifiek commando"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr "Gebruik het fabrikaat specifieke commando"
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Bestand"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 msgid "Print to a file"
 msgstr "Afdrukken naar een bestand"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr "Kromme aanpassen..."
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 msgid "Set Default"
 msgstr "Stel standaard in"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr "Herstel het vorige"
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Print v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "Info"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6122,7 +6326,7 @@ msgstr ""
 "Afdrukken en\n"
 "instellingen opslaan"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6130,15 +6334,15 @@ msgstr ""
 "Instellingen\n"
 "opslaan"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6163,73 +6367,73 @@ msgstr ""
 "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
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 msgid "Paper Size"
 msgstr "Papierafmetingen"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr "Toon alle papierafmetingen"
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
-msgstr "Afmetingen"
+msgstr "Afmetingen:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
-msgstr "Breedte: "
+msgstr "Breedte:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 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:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
-msgstr "Hoogte: "
+msgstr "Hoogte:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 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:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 msgid "Automatic Paper Size"
 msgstr "Automatische papierafmetingen"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr "Aantal kopieën"
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr "Kies het aantal af te drukken kopieën; een waarde tussen 1 en 100"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 msgid "Image Position"
 msgstr "Positie van afbeelding"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Portret"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Landschap"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "Ondersteboven"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Seascape"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6237,122 +6441,122 @@ msgstr ""
 "Kies de orientatie: portret, landschap, ondersteboven of seascape "
 "(ondersteboven landschap)"
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Oriëntatie:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Links:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Rechts:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 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:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Boven:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 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:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Onder:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr ""
 "Afstand vanaf de bovenkant van het papier tot de onderkant van de afbeelding"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 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:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "Midden X:"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Horizontal"
 msgstr "Horzontaal"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "Centreer het plaatje horizontaal op het papier"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Beide"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "Centreer het plaatje op het papier"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "Centreer het plaatje verticaal op het papier"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Stel Printer in"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 msgid "Printer Make:"
 msgstr "Printermerk:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 msgid "Select the make of your printer"
 msgstr "Selecteer het merk van uw printer"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Printer model:"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "Selecteer jouw printer model"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "PPD Bestand:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Geef de juiste PPD bestandsnaam voor jouw printer"
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Bladeren"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Kies de juiste PPD bestandsnaam voor jouw printer"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -6360,52 +6564,52 @@ msgstr ""
 "Selecteer de naam van de uitvoerrij (niet het type, of model, of printer) "
 "die u wilt uitprinten"
 
-#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 msgid "Printer Queue:"
 msgstr "Printerrij:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "Enter the correct command to print to your printer. "
 msgstr "Geef het juiste commando om naar uw printer te printen. "
 
-#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr "Voer de bestandsnaam in waarnaar geprint moet worden. "
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 msgid "File to print to"
 msgstr "Bestand waar print naar toe moet"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 msgid "Print To File"
 msgstr "Afdrukken naar bestand"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "Stel nieuwe printer in"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "Printernaam:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Voer de naam in van de logische printer"
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 msgid "About Gutenprint "
 msgstr "Info over Gutenprint "
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 msgid "Gutenprint Version "
 msgstr "Gutenprint versie"
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Printerinstellingen"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6413,11 +6617,11 @@ msgstr ""
 "Selecteer de naam van de printer (Niet het type, of model, of printer) "
 "waarna je wenst te printen"
 
-#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "Instellen Printer..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6425,11 +6629,11 @@ msgstr ""
 "Kies het printermodel, PPD bestand, en commando die gebruikt wordt om naar "
 "deze printer af te drukken."
 
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "Nieuwe Printer..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6437,23 +6641,32 @@ 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:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Stel standaardwaarden in"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 msgid "Image Size"
 msgstr "Afbeeldingsgrootte"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Schaal:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "Stel de schaal (afmeting) in van het plaatje"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr "Schalen met:"
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6461,31 +6674,31 @@ msgstr ""
 "Moet schaling gemeten worden in het percentage van de beschikbare "
 "paginagrootte of het aantal punten per inch"
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "Schaal de afdruk tot de afmeting van de pagina"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr "Schaal de afdruk tot het aantal punten per inch"
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "Geef de breedte van de afdruk"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "Geef de hoogte van de afdruk"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6493,65 +6706,65 @@ msgstr ""
 "Gebruik de originele\n"
 "grootte van de afbeelding"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 msgid "Set the print size to the size of the image"
 msgstr "Stel de afdrukgrootte gelijk aan de grootte van de afbeelding"
 
-#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "Aanpassing van afdrukkleur"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Stel standaardwaarden in"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Afdruk voorvertoning"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr "Toon uitvoerkanalen:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 msgid "Output"
 msgstr "Uitvoer"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Type uitvoer:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "Kies het gewenste type uitvoer"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "Past uitvoer aan..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 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:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 msgid "Size Units:"
 msgstr "Afmeting eenheden:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Eenheden:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "Kies de basiseenheid van afmeting voor het afdrukken"
 
@@ -6584,11 +6797,11 @@ msgstr "Berkeley lpd (/usr/libexec/lpc)"
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 msgid "Printer"
 msgstr "Printer"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 msgid "(Default Printer)"
 msgstr "(Standaard printer)"
 
@@ -6636,85 +6849,85 @@ msgstr "Grootst mogelijke waarde van Y"
 msgid "_Gamma value"
 msgstr "_Gamma-waarde"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 msgid "Printer Features"
 msgstr "Printermogelijkheden"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 msgid "Output Control"
 msgstr "Controle op uitvoer"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 msgid "Common"
 msgstr "Gezamelijk"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Dutch"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "Dubbelzijdig printen"
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr "Nee"
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 #, fuzzy
 msgid "Value"
 msgstr "Blauw"
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr "Fijnafstelling"
 
@@ -6757,6 +6970,7 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
 #: src/escputil/escputil.c:119
+#, fuzzy
 msgid ""
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
@@ -6792,12 +7006,12 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
@@ -6850,7 +7064,7 @@ msgstr ""
 "    -p|--patterns      Specificeer het aantal patroonsets voor de "
 "uitlijning\n"
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -6935,88 +7149,93 @@ msgstr ""
 "    -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
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Je mag maar een printer of raw apparaat specificeren."
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "U mag maar een printermodel specificeren"
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr "Aantal keuzes voor uitlijning moet tenminste 1 zijn."
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr "Aantal doorgangen voor uitlijning moet tenminste 1 zijn."
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Onbekende optie %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr "Gebruik: %s [OPTIES] commando\n"
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr "Geef `%s --help' voor meer informatie.\n"
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr "Geef `%s -h' voor meer informatie.\n"
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Kan apparaat %s:%s niet openen\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Kan niet printen op printer %s met %s\n"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Kan de opdracht niet versturen naar de printer\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr "Lezen van de duurt te lang\n"
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan niet lezen van %s: %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan %s niet openen lezen/schrijven: %s\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Onbekende optie %c\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan niet schrijven naar %s: %s\n"
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7025,7 +7244,7 @@ msgstr ""
 "\n"
 "Kan niet schrijven naar %s:%s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7036,215 +7255,213 @@ msgstr ""
 "Kan printer type niet vaststellen.\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
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr "Status: Fout\n"
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Status: Zelfstandig aan het printen\n"
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Status: Bezig\n"
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Status: In de wacht\n"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Status: Idle\n"
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Status: In pauze\n"
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Status: Aan het schoonmaken\n"
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "Status: Fabrieksinstelling\n"
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Status: Aan het afsluiten\n"
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Status: Onbekend (%d)\n"
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Fout: fatale fout\n"
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Fout: Het andere interface is gekozen\n"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Fout: Deksel is open\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Fout: Papier zit vast\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Fout: Geen inkt\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Fout: geen papier\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Fout: Wacht op signaal van de afscheurplek\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Fout: in tweezijdige doorvoer\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr "Fout: Onherstelbare fout in snij-instrument\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr "Fout: Herstelbaar snij-instrument zit vast\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr "Fout: Geen CD-lade aanwezig\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Fout: Laden van een kaart gaat fout\n"
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr "Fout: Ladedeksel is open\n"
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Fout: Onbekend (%d)\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Spuitmondjes zelftest\n"
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Inktniveau's:\n"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 msgstr "Kleureninkt"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr "Waarschuwing: Zwarte inkt laag\n"
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Waarschuwing: Onbekend (%d)\n"
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr "Jobnaam: "
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr "inktniveau's"
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr "status"
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Verkrijgen van %s vereist een 'raw' apparaat.\n"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\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
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr "Nummer van onderdeel"
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr "Datum"
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Het identificeren van het printermodel vereist een 'raw' apparaat.\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Kan het printermodel niet identificeren.\n"
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Bezig met het schoonmaken van de koppen..\n"
@@ -7416,7 +7633,7 @@ msgid "Unable to send command to the printer, exiting.\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
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr "Bezig te stoppen\n"
@@ -7442,7 +7659,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7532,9 +7749,9 @@ msgid "Final command was not confirmed.\n"
 msgstr "Laatste commando is niet bevestigd.\n"
 
 #: src/escputil/escputil.c:1908
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7548,12 +7765,12 @@ msgstr ""
 "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
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "Druk op enter om door te gaan > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7563,42 +7780,42 @@ msgstr ""
 "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
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "Stap #%d"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Voer een nieuw vel papier in.\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Nummer valt buiten bereik!\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Begrijp niet wat u zonjuist ingetikt hebt!\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Het beste paar lijnen zou genummerd moeten zijn tussen 1 en %d.\n"
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Probeert de uitlijning in te stellen..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "gelukt.\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7612,7 +7829,7 @@ msgstr ""
 "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
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "Fout in de invoer\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index 55fb9c9..8439153 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 001f514..3f6788b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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"
@@ -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:1737
+#: src/main/print-escp2.c:1752
 #, fuzzy
 msgid "Default"
 msgstr "Ustaw domyślne"
@@ -86,16 +86,16 @@ msgstr ""
 msgid "Density"
 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -145,27 +145,27 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algorytm ditherowania"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
 msgid "Page Size"
 msgstr "Rozmiar"
 
-#: 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -174,276 +174,277 @@ msgstr "Rozmiar"
 msgid "Basic Printer Setup"
 msgstr "Ustawienia drukarki"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: 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: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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr ""
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr ""
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr ""
 
-#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Rozdzielczość"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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:252 src/main/print-escp2.c:238
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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"
 
-#: 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-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Gęstość:"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurowy"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Gęstość:"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Gęstość:"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr ""
 
-#: 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-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 msgid "Light Cyan Transition"
 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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Automatycznie"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Wydrukować do pliku?"
 
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Kolor"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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"
@@ -483,9 +484,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Wydrukuj"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Odcienie szarości"
 
@@ -572,7 +573,7 @@ msgid "Output image type"
 msgstr "Typ wyjściowy:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr ""
 
@@ -636,15 +637,16 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Niebieskozielony"
 
@@ -652,15 +654,16 @@ msgstr "Niebieskozielony"
 msgid "Adjust the cyan gamma"
 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Purpurowy"
 
@@ -668,15 +671,16 @@ msgstr "Purpurowy"
 msgid "Adjust the magenta gamma"
 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Żółć"
 
@@ -684,10 +688,10 @@ msgstr "Żółć"
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr ""
 
@@ -695,8 +699,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr ""
 
@@ -704,10 +708,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr ""
 
@@ -716,14 +720,16 @@ 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Czarny"
 
@@ -731,7 +737,7 @@ msgstr "Czarny"
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr ""
 
@@ -745,7 +751,7 @@ msgstr "Odcienie szarości"
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Purpurowy"
@@ -754,7 +760,7 @@ msgstr "Purpurowy"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Żółć"
@@ -781,9 +787,9 @@ 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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Typ wyjściowy:"
@@ -950,364 +956,375 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Nieznana opcja %c\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:761
+#: src/main/printers.c:772
 msgid "Page size is not valid\n"
 msgstr ""
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:788
+#: src/main/printers.c:799
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:794
+#: src/main/printers.c:805
 msgid "Height must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 msgid "Width must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, 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:813
+#: src/main/printers.c:824
 #, 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr ""
 
-#: src/main/print-escp2.c:228
+#: src/main/print-escp2.c:229
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Rozdzielczość"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 #, fuzzy
 msgid "Ink Set"
 msgstr "Typ tuszu:"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ wyjściowy:"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 msgid "Ink change command"
 msgstr ""
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 msgid "Alternate Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 #, fuzzy
 msgid "Channel Names"
 msgstr "Anuluj"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Niebieskozielony"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Żółć"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Blue Map"
 msgstr "Żółć"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Gęstość:"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Gęstość:"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Typ wyjściowy:"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr ""
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 #, fuzzy
 msgid "Automatic"
 msgstr "Rozmiar"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 #, fuzzy
 msgid "Unidirectional"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1361,128 +1378,129 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: 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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Koperty"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Inne"
 
@@ -1498,50 +1516,50 @@ msgstr ""
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -1654,8 +1672,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "Plik PPD:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 #, fuzzy
 msgid "PPD File"
 msgstr "Plik PPD?"
@@ -1664,293 +1682,299 @@ msgstr "Plik PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Odcienie szarości"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "Odcienie szarości"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 #, fuzzy
 msgid "Seven Color Enhanced"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Jednolite płaszczyzny"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Jednolite płaszczyzny"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Jednolite płaszczyzny"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Jednolite płaszczyzny"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Jednolite płaszczyzny"
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 #, fuzzy
 msgid "Eight Color Raw"
 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 #, 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 #, 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Purpurowy"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 #, fuzzy
 msgid "Light Black"
 msgstr "Czarny"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Żółć"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 #, 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 #, fuzzy
 msgid "Plain Paper Fast Load"
 msgstr "Zwykły papier"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 msgid "Matte Paper Heavyweight"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Zwykły papier"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 msgid "Archival Matte Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 #, fuzzy
 msgid "Print to CD"
 msgstr "Wydrukować do pliku?"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 msgid "Manual Sheet Guide"
 msgstr ""
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Typ wyjściowy:"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 msgid "Rear Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 #, fuzzy
 msgid "Photo Board"
 msgstr "Czarny"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr ""
 
@@ -2846,3549 +2870,3718 @@ msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon BJC-6000"
+msgid "Canon BJC-5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon BJC-6100"
+msgid "Canon BJC-5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon BJC-6200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon BJC-6500"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon BJC-7000"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "Canon BJC-7100"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "Canon BJC-8200"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "Canon S100"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "Canon S200"
+msgid "Canon BJC-8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "Canon S300"
+msgid "Canon BJC-8500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "Canon S400"
+msgid "Canon S100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "Canon S450"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "Canon S500"
+msgid "Canon S300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "Canon S600"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "Canon S630"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "Canon S800"
+msgid "Canon S500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "Canon S4500"
+msgid "Canon S600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "Canon PIXMA iP2000"
+msgid "Canon S630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "Canon PIXMA iP3000"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "Canon PIXMA iP3100"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "Canon PIXMA iP4000"
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "Canon PIXMA iP4100"
+msgid "Canon PIXMA iP3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "Canon PIXMA iP4200"
+msgid "Canon PIXMA iP3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:188
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:217
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:398
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:407
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:412
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:415
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:418
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:504
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 msgid "Generic PCL 4 Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 msgid "Generic PCL 5 Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 msgid "Generic PCL 5c Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 msgid "Generic PCL 5e Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+msgid "HP LaserJet 1022"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Model drukarki:"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+msgid "Sharp AR-M257"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Ustawienia drukarki"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+msgid "Canon SELPHY-CP-720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:983
+msgid "Canon SELPHY-CP-740"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:985
+msgid "Canon SELPHY ES1"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:986
+msgid "Canon SELPHY ES2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:987
+msgid "Canon SELPHY ES20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:988
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "Cal"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr ""
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Points"
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "Set the base unit of measurement to millimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Standard Command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Custom Command"
 msgstr "Polecenie:"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Plik"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 #, fuzzy
 msgid "Print to a file"
 msgstr "Wydrukować do pliku?"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 #, fuzzy
 msgid "Set Default"
 msgstr "Ustaw domyślne"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Drukowanie v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "Informacje o"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6396,7 +6589,7 @@ msgstr ""
 "Ustawienia drukowania\n"
 "i zapisu"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6404,15 +6597,15 @@ msgstr ""
 "Zapisz\n"
 "ustawienia"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Podgląd"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6426,392 +6619,401 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 #, fuzzy
 msgid "Paper Size"
 msgstr "Rozmiar"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Wymiary:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Szerokość:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 msgid "Width of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Wysokość:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 msgid "Height of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Rozmiar"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 #, fuzzy
 msgid "Image Position"
 msgstr "Położenie"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Automatycznie"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Portret"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Pejzaż"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "Z góry na dół"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Pejzaż"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Ułożenie:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Lewa:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the image"
 msgstr "Odległość od lewej krawędzi papieru do obrazu"
 
-#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Prawa:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 msgid "Distance from the right of the paper to the image"
 msgstr "Odległość od prawej krawędzi papieru do obrazu"
 
-#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Góra:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to the image"
 msgstr "Odległość od górnej krawędzi papieru do obrazu"
 
-#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Dół:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 #, 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"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Odległość od dolnej krawędzi papieru do obrazu"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 #, fuzzy
 msgid "Horizontal"
 msgstr "Poziomo"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Oba"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 #, fuzzy
 msgid "Vertical"
 msgstr "Pionowo"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Ustawienia drukarki"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Model drukarki:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 msgid "Select the make of your printer"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Model drukarki:"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "Plik PPD:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 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:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Model drukarki:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "Enter the correct command to print to your printer. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 msgid "File to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 #, fuzzy
 msgid "Print To File"
 msgstr "Wydrukować do pliku?"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 msgid "Enter the name you wish to give this logical printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Ustawienia drukarki"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 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:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 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:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Ustaw domyślne"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 #, fuzzy
 msgid "Image Size"
 msgstr "Rozmiar"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Skalowanie:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 msgid "Set the print size to the size of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "Regulacja koloru wydruku"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Ustaw domyślne"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Podgląd obrazu"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 #, fuzzy
 msgid "Output"
 msgstr "Typ wyjściowy:"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Typ wyjściowy:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 #, fuzzy
 msgid "Size Units:"
 msgstr "Jednostki:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 msgid " "
 msgstr ""
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Jednostki:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr ""
 
@@ -6844,12 +7046,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 #, fuzzy
 msgid "Printer"
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Ustawienia drukarki"
@@ -6899,86 +7101,86 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 #, fuzzy
 msgid "Printer Features"
 msgstr "Ustawienia drukarki"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Output Control"
 msgstr "Typ wyjściowy:"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 #, fuzzy
 msgid "Common"
 msgstr "Polecenie:"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Polish"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "ISOLatin2"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -7041,17 +7243,17 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -7095,88 +7297,93 @@ msgid ""
 "    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Można podać tylko jedną drukarkę lub surowe urządzenie."
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Można podać tylko jeden model drukarki."
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Nieznana opcja %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Nie można otworzyć urządzenia %s: %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %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
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Nie można wysłać polecenia do drukarki\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Nie można odczytać z %s: %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Nieznana opcja %c\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %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
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7185,7 +7392,7 @@ msgstr ""
 "\n"
 "Nie można zapisać do %s: %s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7193,214 +7400,212 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Nasycenie:"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, c-format
 msgid "Error: Ink out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, c-format
 msgid "Error: Paper out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, 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"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, 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"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Do zidentyfikowania drukarki należy użyć surowego urządzenia.\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Można podać tylko jeden model drukarki."
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Czyszczenie głowic...\n"
@@ -7490,7 +7695,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr ""
@@ -7509,7 +7714,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr ""
 
@@ -7588,7 +7793,7 @@ msgstr ""
 #: src/escputil/escputil.c:1908
 #, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7596,12 +7801,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr ""
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7609,42 +7814,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7653,7 +7858,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr ""
@@ -8361,9 +8566,5 @@ msgstr ""
 #~ msgid "Yellow:"
 #~ msgstr "Żółty:"
 
-#, fuzzy
-#~ msgid "Unknown option %s\n"
-#~ msgstr "Nieznana opcja %c\n"
-
 #~ msgid "13x19"
 #~ msgstr "13x19"
diff --git a/po/pt.gmo b/po/pt.gmo
index 71e30d2..eefef02 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index d81794d..077d0ad 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimpprint 4.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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"
@@ -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:1737
+#: src/main/print-escp2.c:1752
 #, fuzzy
 msgid "Default"
 msgstr "Definir Valores Padrão"
@@ -82,16 +82,16 @@ msgstr ""
 msgid "Density"
 msgstr "Densidade:"
 
-#: 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -152,27 +152,27 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmos de \"Dither\"\""
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
 msgid "Page Size"
 msgstr "Tamanho"
 
-#: 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -181,286 +181,287 @@ msgstr "Tamanho"
 msgid "Basic Printer Setup"
 msgstr "Definições da Impressora"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Tamanho do papel para o qual deseja imprimir"
 
-#: 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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "Tipo de Média"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "Fonte de Média"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: src/main/print-pcl.c:1209 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, fuzzy
 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:234 src/main/print-escp2.c:215
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Resolução"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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"
 
-#: 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-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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:265 src/main/print-escp2.c:335
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: 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"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: 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"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: 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"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: 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"
 
-#: 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-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: 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: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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: 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:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Personalizado"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Imprimir para o Ficheiro?"
 
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Cor"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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
@@ -501,9 +502,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Imprimir"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Escala de Cinzento"
 
@@ -590,7 +591,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:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr ""
 
@@ -659,15 +660,16 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Ciano"
 
@@ -676,15 +678,16 @@ msgstr "Ciano"
 msgid "Adjust the cyan gamma"
 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -693,15 +696,16 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Amarelo"
 
@@ -710,10 +714,10 @@ msgstr "Amarelo"
 msgid "Adjust the yellow gamma"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr ""
 
@@ -722,8 +726,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr ""
 
@@ -732,10 +736,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr ""
 
@@ -745,14 +749,16 @@ msgid "Adjust the blue gamma"
 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Preto"
 
@@ -761,7 +767,7 @@ msgstr "Preto"
 msgid "Adjust the black gamma"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr ""
 
@@ -776,7 +782,7 @@ msgstr "Escala de Cinzento"
 msgid "Adjust the cyan gray balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -786,7 +792,7 @@ msgstr "Magenta"
 msgid "Adjust the magenta gray balance"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
@@ -817,9 +823,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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Tipo de Output:"
@@ -986,384 +992,395 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s não é um paràmetro válido do tipo %s\n"
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Impressora desconhecida %s\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, 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:761
+#: src/main/printers.c:772
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Tamanho da imagem não é válido\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, 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"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:799
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Mergem esquerda não pode ser menor que zero\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:805
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Mergem esquerda não pode ser menor que zero\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Margem de topo não pode ser menor que zero\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, 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:813
+#: src/main/printers.c:824
 #, 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 #, fuzzy
 msgid "Print Quality"
 msgstr "720 DPI Qualidade Máxima"
 
-#: src/main/print-escp2.c:228
+#: src/main/print-escp2.c:229
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Resolução e qualidade da impressão"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 #, fuzzy
 msgid "Ink Set"
 msgstr "Tipo de tinta"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 #, fuzzy
 msgid "Output Order"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 #, fuzzy
 msgid "Ink change command"
 msgstr "Comando desconhecido.\n"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Repetindo o processo de alinhamento.\n"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 #, fuzzy
 msgid "Channel Names"
 msgstr "Cancelar"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Ciano"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Amarelo"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Blue Map"
 msgstr "Preto e Branco"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Filme Lustroso"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 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: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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamanho"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, 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"
 
-#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1417,128 +1434,129 @@ msgid "test print"
 msgstr "impressão de teste"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 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: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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 msgid "Three Color Composite"
 msgstr "Três Cores Compósito"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 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: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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 msgid "Five Color Photo Composite"
 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 msgid "Plain Paper"
 msgstr "Papel Normal"
 
-#: 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 msgstr "Filme Lustroso"
 
-#: 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Envelopes"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "Papel Mate"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "Papel para Impressora Jacto de Tinta"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 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: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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "Papel de Fotografia"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografia Brilhante Premium"
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel de Qualidade Fotografica Lustroso"
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr "Papel Pesado 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Outro"
 
@@ -1554,56 +1572,56 @@ msgstr "Manual com Pausa"
 msgid "Manual without Pause"
 msgstr "Manual sem Pausa"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 #, fuzzy
 msgid "Glossy"
 msgstr "Filme Lustroso"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 #, fuzzy
 msgid "Matte"
 msgstr "Papel Mate"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 #, fuzzy
 msgid "Black Balance"
 msgstr "Preto e Branco"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
@@ -1717,8 +1735,8 @@ msgstr "Cartuchos Cor + Fotografia"
 msgid "PPDFile"
 msgstr "Ficheiro PPD:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 #, fuzzy
 msgid "PPD File"
 msgstr "Ficheiro PPD?"
@@ -1727,299 +1745,305 @@ msgstr "Ficheiro PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 msgid "Two Level Grayscale"
 msgstr "Escala de Cinzento de 2 Níveis"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "Escala de Cinzento de 2 Níveis"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr "Quato Tons"
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr "Seis Cores Compósito Realçado"
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 msgid "Seven Color Photo"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr "Sete Cores Realçado"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sete Cores Realçado"
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Quatro Cores Standard"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Três Cores Compósito"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Três Cores Compósito"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Quatro Cores Standard"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Quatro Cores Standard"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seis Cores Compósito Realçado"
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sete Cores Realçado"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Seis Cores Foto"
 
-#: 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 #, 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 #, 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 #, 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 #, fuzzy
 msgid "Light Black"
 msgstr "Preto"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Amarelo"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Filme Lustroso"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 #, 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr "Papel Normal Carregação Rápida"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Cartão"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr "Película"
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Papel Mate"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papel ColorLife"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Papel Mate"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr "Rolo de Alimentação"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 #, 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 #, fuzzy
 msgid "Print to CD"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manual"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manual"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Tabuleiro"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 #, fuzzy
 msgid "Photo Board"
 msgstr "Papel de Fotografia"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Auto Seleccionar"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr ""
 
@@ -2922,3557 +2946,3726 @@ msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon BJC-6000"
+msgid "Canon BJC-5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon BJC-6100"
+msgid "Canon BJC-5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon BJC-6200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon BJC-6500"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon BJC-7000"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "Canon BJC-7100"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "Canon BJC-8200"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "Canon S100"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "Canon S200"
+msgid "Canon BJC-8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "Canon S300"
+msgid "Canon BJC-8500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "Canon S400"
+msgid "Canon S100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "Canon S450"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "Canon S500"
+msgid "Canon S300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "Canon S600"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "Canon S630"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "Canon S800"
+msgid "Canon S500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "Canon S4500"
+msgid "Canon S600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "Canon PIXMA iP2000"
+msgid "Canon S630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "Canon PIXMA iP3000"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "Canon PIXMA iP3100"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "Canon PIXMA iP4000"
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "Canon PIXMA iP4100"
+msgid "Canon PIXMA iP3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "Canon PIXMA iP4200"
+msgid "Canon PIXMA iP3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:188
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:217
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:398
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:407
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:412
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:415
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:418
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:504
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+msgid "HP LaserJet 1022"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Nome da Impressora:"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+msgid "Sharp AR-M257"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Configurar a Impressora"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+msgid "Canon SELPHY-CP-720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:983
+msgid "Canon SELPHY-CP-740"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:985
+msgid "Canon SELPHY ES1"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:986
+msgid "Canon SELPHY ES2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:987
+msgid "Canon SELPHY ES20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:988
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "Polegada"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "Definir como base das unidades de medida a polegada"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Definir como base das unidades de medida o centímetro"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Points"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, 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:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Definir como base das unidades de medida o centímetro"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 #, 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:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "Ouput de cor"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr "Imprimir em sombras de cinzento usando tinta preta"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standard"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Custom Command"
 msgstr "Comando:"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Ficheiro"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 #, fuzzy
 msgid "Print to a file"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 #, fuzzy
 msgid "Set Default"
 msgstr "Definir Valores Padrão"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Imprimir v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "Acerca"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6480,21 +6673,21 @@ msgstr ""
 "Imprimir e\n"
 "Gravar Definições"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
 msgstr "Gravar Definições"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6522,76 +6715,76 @@ msgstr ""
 "sua\n"
 "posição original."
 
-#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 #, fuzzy
 msgid "Paper Size"
 msgstr "Tamanho"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Dimensões:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Largura:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 msgid "Width of the paper that you wish to print to"
 msgstr "Largura do papel para o qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Altura"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 msgid "Height of the paper that you wish to print to"
 msgstr "Altura do papel para o qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Tamanho"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 #, fuzzy
 msgid "Image Position"
 msgstr "Posição"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Retrato"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Paisagem"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "De cabeça para baixo"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Paisagem de cabeça para baixo"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6599,125 +6792,125 @@ msgstr ""
 "Seleccione a orientação: retrato, paisagem, cabeça para baixo, ou paisagem "
 "de cabeça para baixo"
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Orientação:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Esquerda:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the image"
 msgstr "Distância da esquerda do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Direita:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 msgid "Distance from the right of the paper to the image"
 msgstr "Distância da direita do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Topo:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to the image"
 msgstr "Distência do topo do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Fundo:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 #, 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"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Distância do fundo do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "Centro:"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontalmente"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "Centrar a imagem horizontalmente no papel"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Ambos"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "Centrar a imagem no papel"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 #, fuzzy
 msgid "Vertical"
 msgstr "Verticalmente"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "Centrar a imagem verticalmente no papel"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Configurar a Impressora"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Nome da Impressora:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Seleccione o seu modelo de impressora"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Modelo da Impressora:"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "Seleccione o seu modelo de impressora"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "Ficheiro PPD:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Insira o ficheiro PPD correct para a sua impressora"
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Seleccione o ficheiro PPD correcto para a sua impressora"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -6726,58 +6919,58 @@ msgstr ""
 "Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n"
 "a qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Nome da Impressora:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, 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:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 #, fuzzy
 msgid "File to print to"
 msgstr "impressão de teste"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 #, fuzzy
 msgid "Print To File"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "Definir nova Impressora"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "Nome da Impressora:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Insira o noma que deseja dar a esta impressora lógica"
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Acerca do Gimp-Print "
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Versão do Gimp-Print "
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Definições da Impressora"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6785,11 +6978,11 @@ msgstr ""
 "Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n"
 "a qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "Configurar Impressora..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6798,11 +6991,11 @@ msgstr ""
 "imprimir\n"
 "para esta impressora"
 
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "Nova Impressora..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6810,24 +7003,33 @@ 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"
 
-#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Definir Valores Padrão"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 #, fuzzy
 msgid "Image Size"
 msgstr "Tamanho"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Redimesionamento:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "Definir a escala (tamanho) da imagem"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6835,31 +7037,31 @@ 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"
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Precentagem"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "Redimensionar a impressão para o tamanho da página"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr "Redimensionar a impressão para o número de pontos por polegada"
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "Definir a largura da impressão"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "Definir a altura da impressão"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6867,69 +7069,69 @@ msgstr ""
 "Usar Original\n"
 "Tamanho de Imagem"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 msgid "Set the print size to the size of the image"
 msgstr "Definir como tamanho de impressão o tamanho da imagem"
 
-#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "Ajustamento da Cor de Impressão"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Definir Valores Padrão"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Previsualização da Imagem"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 #, fuzzy
 msgid "Output"
 msgstr "Tipo de Output:"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Tipo de Output:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "Seleccione o tipo de output desejado"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "Ajustar o Output..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Ajustar equilíbrio de cor, brilho, contraste, saturação e algoritmo de "
 "\"dither\""
 
-#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 #, fuzzy
 msgid "Size Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "Seleccione a base das unidades de medida para impressão"
 
@@ -6962,12 +7164,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 #, fuzzy
 msgid "Printer"
 msgstr "Imprimir"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Configurar a Impressora"
@@ -7017,90 +7219,90 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 #, fuzzy
 msgid "Printer Features"
 msgstr "Definições da Impressora"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Output Control"
 msgstr "Tipo de Output:"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 #, fuzzy
 msgid "Common"
 msgstr "Comando:"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Extra 1"
 msgstr "Tabuleiro 1"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 2"
 msgstr "Tabuleiro 2"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 3"
 msgstr "Tabuleiro 3"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 4"
 msgstr "Tabuleiro 4"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Portuguese"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -7180,12 +7382,12 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
@@ -7228,7 +7430,7 @@ msgstr ""
 "    -m|--model         Specify the precise printer model for head "
 "alignment.\n"
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
@@ -7308,88 +7510,93 @@ msgstr ""
 "    -q Suppress the banner.\n"
 "    -m Specify the precise printer model for head alignment.\n"
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Você só pode especificar uma impresoora ou dispositivo"
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Você só pode especificar um modelo de impressora"
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Opção desconhecida %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Não foi possível abrir o dispositivo %s: %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Não é possível imprimir para impressora %s com %s\n"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Não foi possível enviar comando para a impressora\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Não é possível ler a partir de %s: %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "Status da impressora requere a utilização de um dipositivo.\n"
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Não foi possível abrir %s escrita/leitura: %s\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Opção desconhecida %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %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
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7398,7 +7605,7 @@ msgstr ""
 "\n"
 "Não foi possível escrever para %s: %s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7409,214 +7616,212 @@ msgstr ""
 "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
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Saturação:"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "Erro no input\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "Erro no input\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 msgstr "Cor da Tinta"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "Percentagem restante"
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, 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"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, 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"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Identificação da impressora requere a utilização de um dispositivo.\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Você só pode especificar um modelo de impressora"
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Limpando as cabeças...\n"
@@ -7792,7 +7997,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\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
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr ""
@@ -7818,7 +8023,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7908,9 +8113,9 @@ msgid "Final command was not confirmed.\n"
 msgstr "O comando final não foi confirmado.\n"
 
 #: src/escputil/escputil.c:1908
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7924,12 +8129,12 @@ msgstr ""
 "Por favor coloque uma folha de papel na impressora para iniciar\n"
 "o processo de alinhamento da cabeça.\n"
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "Pressione enter para continuar > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7940,42 +8145,42 @@ msgstr ""
 "padrão.\n"
 "Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "Passagem #%d"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Por favor insira uma nova folha de papel.\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Número fora do intervalo|\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Eu não consigo intender o que escreveu!\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "O melhor par de linhasdeve estar numerado entre 1 e %d.\n"
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Tentando definir o alinhamento..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "sucesso.\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7990,7 +8195,7 @@ msgstr ""
 "é 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
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "Erro no input\n"
@@ -9030,9 +9235,6 @@ msgstr "Obtenção da próxima linha falhou em %.0f\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"
 
-#~ msgid "Unknown option %s\n"
-#~ msgstr "Opção desconhecida %s\n"
-
 #~ msgid "1440 x 360 DPI"
 #~ msgstr "1440 x 360 DPI"
 
diff --git a/po/sk.gmo b/po/sk.gmo
index 1854830..0f8a327 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index 6c41b4c..7fd193f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GIMP Print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\n"
 "PO-Revision-Date: 2002-05-20 18:08+0100\n"
 "Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\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:1737
+#: src/main/print-escp2.c:1752
 #, fuzzy
 msgid "Default"
 msgstr "Nastaviť štandardné"
@@ -85,16 +85,16 @@ msgstr ""
 msgid "Density"
 msgstr "Hustota:"
 
-#: 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -155,27 +155,27 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmus rozptylu"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -184,286 +184,287 @@ msgstr "Veľkosť"
 msgid "Basic Printer Setup"
 msgstr "Nastavenie tlačiarne"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Veľkosť papiera, na ktorý chcete tlačiť"
 
-#: 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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "Typ média"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "Zdroj média"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: src/main/print-pcl.c:1209 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, fuzzy
 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:234 src/main/print-escp2.c:215
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Rozlíšenie"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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"
 
-#: 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-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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"
 
-#: 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-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:"
 
-#: src/main/print-canon.c:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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"
 
-#: 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-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: 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č"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurová"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: 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č"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: 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č"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: 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č"
 
-#: 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-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: 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: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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Jasná purpurová"
 
-#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Vlastný"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tlačiť do súboru?"
 
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Farebne"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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
@@ -504,9 +505,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Tlačiť"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "V odtieňoch šedej"
 
@@ -593,7 +594,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:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr ""
 
@@ -661,15 +662,16 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Azúrová"
 
@@ -678,15 +680,16 @@ msgstr "Azúrová"
 msgid "Adjust the cyan gamma"
 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Purpurová"
 
@@ -695,15 +698,16 @@ msgstr "Purpurová"
 msgid "Adjust the magenta gamma"
 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Žltá"
 
@@ -712,10 +716,10 @@ msgstr "Žltá"
 msgid "Adjust the yellow gamma"
 msgstr "Prispôsobenie vyváženie žltej farby pre tlač"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr ""
 
@@ -724,8 +728,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Prispôsobenie vyváženie žltej farby pre tlač"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr ""
 
@@ -734,10 +738,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Prispôsobenie vyváženie purpurovej farby pre tlač"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr ""
 
@@ -747,14 +751,16 @@ msgid "Adjust the blue gamma"
 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Čierna"
 
@@ -763,7 +769,7 @@ msgstr "Čierna"
 msgid "Adjust the black gamma"
 msgstr "Prispôsobenie vyváženie azúrovej farby pre tlač"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr ""
 
@@ -778,7 +784,7 @@ msgstr "V odtieňoch šedej"
 msgid "Adjust the cyan gray balance"
 msgstr "Prispôsobenie vyváženie azúrovej farby pre tlač"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Purpurová"
@@ -788,7 +794,7 @@ msgstr "Purpurová"
 msgid "Adjust the magenta gray balance"
 msgstr "Prispôsobenie vyváženie purpurovej farby pre tlač"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Prispôsobenie vyváženie žltej farby pre tlač"
@@ -819,9 +825,9 @@ 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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Typ výstupu:"
@@ -988,384 +994,395 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s nie je platný parameter pre typ %s\n"
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Neznáma tlačiareň %s\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, 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:761
+#: src/main/printers.c:772
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Veľkosť obrázka nie je platná\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Horný okraj nemôže byť menší ako nula\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:799
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Ľavý okraj nemôže byť menší ako nula\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:805
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Ľavý okraj nemôže byť menší ako nula\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Horný okraj nemôže byť menší ako nula\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, 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:813
+#: src/main/printers.c:824
 #, 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: 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:228
+#: src/main/print-escp2.c:229
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Rozlíšenie a kvalita tlače"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 #, fuzzy
 msgid "Ink Set"
 msgstr "Typ atramentu"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 #, fuzzy
 msgid "Ink change command"
 msgstr "Neznámy príkaz.\n"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Opakujem proces zarovnávania.\n"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 #, fuzzy
 msgid "Channel Names"
 msgstr "Storno"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Azúrová"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Prispôsobenie vyváženie azúrovej farby pre tlač"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Purpurová"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Prispôsobenie vyváženie purpurovej farby pre tlač"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Žltá"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Prispôsobenie vyváženie žltej farby pre tlač"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Blue Map"
 msgstr "Čiernobielo"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Prispôsobenie vyváženie azúrovej farby pre tlač"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Prispôsobenie vyváženie žltej farby pre tlač"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Prispôsobenie vyváženie žltej farby pre tlač"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Prispôsobenie vyváženie azúrovej farby pre tlač"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Lesklý film"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Prispôsobenie vyváženie žltej farby pre tlač"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Štandardný"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 #, fuzzy
 msgid "Automatic"
 msgstr "Veľkosť"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Tlačiareň nepodporuje farebný výstup\n"
 
-#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1419,128 +1436,129 @@ msgid "test print"
 msgstr "Test tlače"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 msgid "Four Color Standard"
 msgstr "Štandardný štvorfarebný"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 msgid "Three Color Composite"
 msgstr "Kompozitný trojfarebný"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 msgid "Six Color Photo"
 msgstr "Fotografický šesťfarebný"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: 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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 msgid "Five Color Photo Composite"
 msgstr "Kompozitný fotografický päťfarebný"
 
-#: 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 msgid "Transparencies"
 msgstr "Priesvitná fólia"
 
-#: 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Obálky"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "Matný papier"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "Papier pre atramentovú tlačiareň"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier s fotografickou kvalitou"
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "Fotografický papier"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr "Lesklý foto papier Premium"
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr "Ligotavý foto papier Premium"
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý fotografický papier"
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Iné"
 
@@ -1556,56 +1574,56 @@ msgstr "Manuálne s prerušením"
 msgid "Manual without Pause"
 msgstr "Manuálne bez prerušenia"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 #, fuzzy
 msgid "Glossy"
 msgstr "Lesklý film"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 #, fuzzy
 msgid "Matte"
 msgstr "Matný papier"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Prispôsobenie vyváženie azúrovej farby pre tlač"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Prispôsobenie vyváženie purpurovej farby pre tlač"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Prispôsobenie vyváženie žltej farby pre tlač"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 #, fuzzy
 msgid "Black Balance"
 msgstr "Čiernobielo"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Prispôsobenie vyváženie azúrovej farby pre tlač"
@@ -1719,8 +1737,8 @@ msgstr "Farebná + Foto kazeta"
 msgid "PPDFile"
 msgstr "PPD súbor:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD súbor?"
@@ -1729,301 +1747,307 @@ msgstr "PPD súbor?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "V odtieňoch šedej"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "V odtieňoch šedej"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr "Kompozitný rozšírený šesťfarebný"
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr "Rozšírený sedemfarebný"
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Rozšírený sedemfarebný"
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Štandardný štvorfarebný"
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Kompozitný trojfarebný"
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Kompozitný trojfarebný"
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Štandardný štvorfarebný"
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Štandardný štvorfarebný"
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Fotografický šesťfarebný"
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Kompozitný rozšírený šesťfarebný"
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Rozšírený sedemfarebný"
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 #, fuzzy
 msgid "Eight Color Raw"
 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 #, 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 #, 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 #, 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Jasná purpurová"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 #, fuzzy
 msgid "Light Black"
 msgstr "Čierna"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Žltá"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý film"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 #, 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr "Obyčajný papier rýchle nasadenie"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Pohľadnica"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matný papier"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Lesklý foto papier Premium"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Obyčajný papier"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matný papier"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr "Kotúčový podávač"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 #, 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 #, fuzzy
 msgid "Print to CD"
 msgstr "Tlačiť do súboru?"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manuál"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manuál"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Zásobník"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 #, fuzzy
 msgid "Photo Board"
 msgstr "Fotografický papier"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Automatický výber"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr ""
 
@@ -2927,3557 +2951,3726 @@ msgid "Canon BJC-4400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon BJC-6000"
+msgid "Canon BJC-5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon BJC-6100"
+msgid "Canon BJC-5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon BJC-6200"
+msgid "Canon BJC-6000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon BJC-6500"
+msgid "Canon BJC-6100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon BJC-7000"
+msgid "Canon BJC-6200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "Canon BJC-7100"
+msgid "Canon BJC-6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "Canon BJC-8200"
+msgid "Canon BJC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "Canon S100"
+msgid "Canon BJC-7100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "Canon S200"
+msgid "Canon BJC-8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "Canon S300"
+msgid "Canon BJC-8500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "Canon S400"
+msgid "Canon S100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "Canon S450"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "Canon S500"
+msgid "Canon S300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "Canon S600"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "Canon S630"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "Canon S800"
+msgid "Canon S500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "Canon S4500"
+msgid "Canon S600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "Canon PIXMA iP2000"
+msgid "Canon S630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "Canon PIXMA iP3000"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "Canon PIXMA iP3100"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "Canon PIXMA iP4000"
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "Canon PIXMA iP4100"
+msgid "Canon PIXMA iP3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "Canon PIXMA iP4200"
+msgid "Canon PIXMA iP3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:188
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:217
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:398
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:407
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:412
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:415
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:418
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:504
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definovanie novej tlačiarne"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definovanie novej tlačiarne"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definovanie novej tlačiarne"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definovanie novej tlačiarne"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+msgid "HP LaserJet 1022"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Názov tlačiarne:"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+msgid "Sharp AR-M257"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Nastaviť tlačiareň"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+msgid "Canon SELPHY-CP-720"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:983
+msgid "Canon SELPHY-CP-740"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:985
+msgid "Canon SELPHY ES1"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:986
+msgid "Canon SELPHY ES2"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:987
+msgid "Canon SELPHY ES20"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:988
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "palce"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "Nastaviť palce ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Nastaviť centimetre ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Points"
 msgstr "Tlačiť"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Nastaviť palce ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Nastaviť centimetre ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Nastaviť palce ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "Farebný výstup"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr "Tlačiť v odtieňoch šedej s použitím čiernej farby"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Standard Command"
 msgstr "Štandardný"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Custom Command"
 msgstr "Príkaz:"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Súbor"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 #, fuzzy
 msgid "Print to a file"
 msgstr "Tlačiť do súboru?"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 #, fuzzy
 msgid "Set Default"
 msgstr "Nastaviť štandardné"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Storno"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Tlač v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "O programe"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6485,7 +6678,7 @@ msgstr ""
 "Uložiť nastavenia\n"
 "a vytlačiť"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6493,15 +6686,15 @@ msgstr ""
 "Uložiť\n"
 "nastavenia"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Tlačiť"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Náhľad"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6525,201 +6718,201 @@ msgstr ""
 "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:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 #, fuzzy
 msgid "Paper Size"
 msgstr "Veľkosť"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Rozmery:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Šírka:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 msgid "Width of the paper that you wish to print to"
 msgstr "Šírka papiera, na ktorý chcete tlačiť"
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Výška:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 msgid "Height of the paper that you wish to print to"
 msgstr "Výška papiera, na ktorý chcete tlačiť"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Veľkosť"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 #, fuzzy
 msgid "Image Position"
 msgstr "Pozícia"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Na výšku"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Na šírku"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "Hore nohami"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Na šírku"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 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 "
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Orientácia:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Ľavý:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the image"
 msgstr "Vzdialenosť od ľavého okraja papiera k obrázku"
 
-#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Pravý:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 msgid "Distance from the right of the paper to the image"
 msgstr "Vzdialenosť od pravého okraja papiera k obrázku"
 
-#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Horný:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to the image"
 msgstr "Vzdialenosť od horného okraja papiera k obrázku"
 
-#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Dolný:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 #, 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"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Vzdialenosť od dolného okraja papiera k obrázku"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "Centrovanie:"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 #, fuzzy
 msgid "Horizontal"
 msgstr "Vodorovne"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "Vycentrovať vodorovne obrázok na papieri"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Oboje"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "Vycentrovať obrázok na papieri"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 #, fuzzy
 msgid "Vertical"
 msgstr "Zvislo"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "Vycentrovať obrázok zvisle na papieri"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Nastaviť tlačiareň"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Názov tlačiarne:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Vyberte model vašej tlačiarne"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Model tlačiarne:"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "Vyberte model vašej tlačiarne"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "PPD súbor:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Vložte správny PPD názov súboru pre vašu tlačiareň"
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Prechádzať"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Zvoľte správny PPD názov súboru pre vašu tlačiareň"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -6728,58 +6921,58 @@ msgstr ""
 "Zvoľte si názov tlačiarne (nie typ alebo model tlačiarne), na ktorej chcete "
 "tlačiť"
 
-#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Názov tlačiarne:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, 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ň"
 
-#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 #, fuzzy
 msgid "File to print to"
 msgstr "Test tlače"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 #, fuzzy
 msgid "Print To File"
 msgstr "Tlačiť do súboru?"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "Definovanie novej tlačiarne"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "Názov tlačiarne:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Vložte označenie, ktoré chcete dať tejto logickej tlačiarni"
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "O Gimp-Print "
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Verzia Gimp-Print"
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Nastavenie tlačiarne"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6787,11 +6980,11 @@ msgstr ""
 "Zvoľte si názov tlačiarne (nie typ alebo model tlačiarne), na ktorej chcete "
 "tlačiť"
 
-#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "Nastavenie tlačiarne..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6799,11 +6992,11 @@ msgstr ""
 "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:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "Nová tlačiareň..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6811,24 +7004,33 @@ 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ť."
 
-#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Nastaviť štandardné"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 #, fuzzy
 msgid "Image Size"
 msgstr "Veľkosť"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Zmena:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "Nastaviť zväčšenie (veľkosť) obrázku"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6836,31 +7038,31 @@ msgstr ""
 "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:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Percentá"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "Zmeniť veľkosť tlače podľa rozmerov strany"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr "Zmeniť veľkosť tlače podľa počtu bodov na palec"
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "Nastaviť šírku tlače"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "Nastaviť výšku tlače"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6868,68 +7070,68 @@ msgstr ""
 "Použiť pôvodnú\n"
 "veľkosť obrázka"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 msgid "Set the print size to the size of the image"
 msgstr "Nastavenie veľkosti tlače na veľkosť obrázku"
 
-#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "Prispôsobenie farieb pre tlač"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Nastaviť štandardné"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Náhľad obrázku"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 #, fuzzy
 msgid "Output"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "Zvoľte vytúžený typ výstupu"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "Prispôsobiť výstup..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Nastavenie farebného vyváženia, kontrastu, sýtosti a algoritmu rozptylu"
 
-#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 #, fuzzy
 msgid "Size Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "Zvoliť základnú mernú jednotku pre tlač"
 
@@ -6962,12 +7164,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 #, fuzzy
 msgid "Printer"
 msgstr "Tlačiť"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Nastaviť tlačiareň"
@@ -7017,90 +7219,90 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 #, fuzzy
 msgid "Printer Features"
 msgstr "Nastavenie tlačiarne"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Output Control"
 msgstr "Typ výstupu:"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 #, fuzzy
 msgid "Common"
 msgstr "Príkaz:"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Extra 1"
 msgstr "Zásobník 1"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 2"
 msgstr "Zásobník 2"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 3"
 msgstr "Zásobník 3"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 4"
 msgstr "Zásobník 4"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Slovak"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -7184,12 +7386,12 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
@@ -7240,7 +7442,7 @@ msgstr ""
 "    -m|--model         Určenie presného modelu tlačiarne pre zarovnanie "
 "hlavy.\n"
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 #, fuzzy
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
@@ -7321,88 +7523,93 @@ msgstr ""
 "    -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
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Môžete špecifikovať len jednu tlačiareň alebo prvotné zariadenie."
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Je možné zvoliť len jeden model tlačiarne."
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Neznáme nastavenie %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr ""
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Nie je možné otvoriť zariadenie %s: %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, 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"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Nie je možné poslať príkaz na tlačiareň\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Nie je možné čítať z %s: %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "Stav tlačiarne vyžaduje používanie základného zariadenia.\n"
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %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
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Neznáme nastavenie %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %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
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7411,7 +7618,7 @@ msgstr ""
 "\n"
 "Nie je možné zapisovať do %s: %s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7422,214 +7629,212 @@ msgstr ""
 "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
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Sýtosť:"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "Chyba na vstupe\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "Chyba na vstupe\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 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
-#: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, 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"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, 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"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, 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"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Je možné zvoliť len jeden model tlačiarne."
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Čistenie hláv...\n"
@@ -7789,7 +7994,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Nie je možné odoslať príkaz pre tlačiareň, koniec.\n"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr ""
@@ -7815,7 +8020,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7904,9 +8109,9 @@ msgid "Final command was not confirmed.\n"
 msgstr "Záverečný príkaz nebol potvrdený.\n"
 
 #: src/escputil/escputil.c:1908
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7920,12 +8125,12 @@ msgstr ""
 "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
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "Pre pokračovanie stlačte enter > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7935,42 +8140,42 @@ 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"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "Prechod #%d"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Vložte prosím nový hárok papiera.\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Číslo je mimo rozsahu!\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Nedokážem pochopiť, čo ste napísali!\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, 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"
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Pokúšam sa nastaviť zarovnávanie..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "úspešné.\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7983,7 +8188,7 @@ msgstr ""
 "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
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "Chyba na vstupe\n"
@@ -9019,9 +9224,6 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 #~ msgid "Parameter %s out of range (value %d, min %d, max %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"
-
 #~ msgid "1440 x 360 DPI"
 #~ msgstr "1440 x 360 DPI"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index c0279ec..0b03d18 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 1c5825b..4dc2d33 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.83.4.2 2007/05/13 17:09:40 rlk Exp $
+# $Id: sv.po,v 1.83.4.4 2007/12/16 22:39:52 rlk Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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:1737
+#: src/main/print-escp2.c:1752
 msgid "Default"
 msgstr "Standard"
 
@@ -79,16 +79,16 @@ msgstr ""
 msgid "Density"
 msgstr "Densitet"
 
-#: 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -149,26 +149,26 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Färgutjämningsalgoritm"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 msgid "Page Size"
 msgstr "Pappersstorlek"
 
-#: 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -176,283 +176,284 @@ msgstr "Pappersstorlek"
 msgid "Basic Printer Setup"
 msgstr "Grundläggande skrivarinställningar"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: 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: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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "Mediatyp"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "Mediakälla"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, 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
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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:252 src/main/print-escp2.c:238
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr "Bläckkanaler"
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr "Avancerad skrivarfunktionalitet"
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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:265 src/main/print-escp2.c:335
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "Dubbelsidad utskrift"
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: 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:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: 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:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: 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:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: 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:325 src/main/print-canon.c:326
-#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
+#: src/main/print-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: 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: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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: 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:333 src/main/print-canon.c:334
-#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
+#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: 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:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 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
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (Vänd)"
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "CD - 5 tum"
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "CD - 3 tum"
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Anpassat"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut till fil?"
 
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "Färg"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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"
@@ -491,9 +492,9 @@ msgstr "Rå"
 msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "Gråtoner"
 
@@ -577,7 +578,7 @@ msgid "Output image type"
 msgstr "Utdatatyp:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr "Råkanaler"
 
@@ -642,15 +643,16 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -658,15 +660,16 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Justera cyangamma"
 
-#: 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -674,15 +677,16 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Justera magentagamma"
 
-#: 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "Gul"
 
@@ -690,10 +694,10 @@ msgstr "Gul"
 msgid "Adjust the yellow gamma"
 msgstr "Justera gulgamma"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr "Röd"
 
@@ -701,8 +705,8 @@ msgstr "Röd"
 msgid "Adjust the red gamma"
 msgstr "Justera rödgamma"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr "Grön"
 
@@ -710,10 +714,10 @@ msgstr "Grön"
 msgid "Adjust the green gamma"
 msgstr "Justera gröngamma"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr "Blå"
 
@@ -722,14 +726,16 @@ 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "Svart"
 
@@ -737,7 +743,7 @@ msgstr "Svart"
 msgid "Adjust the black gamma"
 msgstr "Justera svartgamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr "Cyanbalans"
 
@@ -750,7 +756,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:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 msgid "Magenta Balance"
 msgstr "Magentabalans"
 
@@ -758,7 +764,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:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 msgid "Yellow Balance"
 msgstr "Gulbalans"
 
@@ -785,9 +791,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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Utdatatyp:"
@@ -938,79 +944,79 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, 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:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "\"%s\" är inte en giltig %s\n"
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, 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:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, 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:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Okänd typparameter %s (%d)\n"
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, 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:761
+#: src/main/printers.c:772
 msgid "Page size is not valid\n"
 msgstr "Pappersstorleken är inte giltig\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, 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:788
+#: src/main/printers.c:799
 #, 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:794
+#: src/main/printers.c:805
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Vänstermarginalen får inte vara negativ\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Övre marginalen får inte vara negativ\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1019,7 +1025,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:813
+#: src/main/printers.c:824
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1028,279 +1034,290 @@ 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr "Automatiskt utskriftsläge"
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr "Automatiskt utskriftsläge"
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Utskriftskvalitet"
 
-#: src/main/print-escp2.c:228
+#: src/main/print-escp2.c:229
 msgid "Resolution of the print"
 msgstr "Upplösning på utskriften"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr "Förbättrat glansig"
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr "Lägg till glansförbättring"
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 #, fuzzy
 msgid "Ink Set"
 msgstr "Bläcktyp"
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 #, fuzzy
 msgid "Output Order"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr "Justeringsval"
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 #, fuzzy
 msgid "Ink change command"
 msgstr "Okänt kommando.\n"
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 msgid "Alternate Alignment Choices"
 msgstr "Alternativa justeringsval"
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 msgid "Channel Names"
 msgstr "Kanalnamn"
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 msgid "Cyan Map"
 msgstr "Cyankarta"
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 msgid "Adjust the cyan map"
 msgstr "Justera cyankartan"
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 msgid "Magenta Map"
 msgstr "Magentakarta"
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 msgid "Adjust the magenta map"
 msgstr "Justera magentakartan"
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 msgid "Yellow Map"
 msgstr "Gulkarta"
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 msgid "Adjust the yellow map"
 msgstr "Justera gulkartan"
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 msgid "Blue Map"
 msgstr "Blåkarta"
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 msgid "Adjust the blue map"
 msgstr "Justera blåkartan"
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr "Rödkarta"
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 msgid "Adjust the red map"
 msgstr "Justera rödkartan"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 msgid "Gloss Level"
 msgstr "Glansnivå"
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 msgid "Adjust the gloss level"
 msgstr "Justera glansnivån"
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utdatatyp:"
 
-#: 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 msgid "Bidirectional"
 msgstr "Dubbelriktad"
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 msgid "Unidirectional"
 msgstr "Enkelriktad"
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr "Undvik närmaste granne"
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, 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:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Utskriftsflaggor inte validerade; kan inte skriva ut.\n"
@@ -1355,131 +1372,132 @@ 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: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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 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: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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 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: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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 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: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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 msgid "Five Color Photo Composite"
 msgstr "Femfärgsfoto sammansatt"
 
-#: 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 msgstr "Glansig 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "Kuvert"
 
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "Matte-papper"
 
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "Bläckstrålepapper"
 
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr "Bläckstrålepapper med fotokvalitet"
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "Fotopapper"
 
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr "Premiumglansigt fotopapper"
 
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr "Fotopapper med premiumlyster"
 
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr "Glansigt papper med fotokvalitet"
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr "Tungt Ilford-papper"
 
-#: 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "Annat"
 
@@ -1495,50 +1513,50 @@ msgstr "Manuell med paus"
 msgid "Manual without Pause"
 msgstr "Manuell utan paus"
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr "Inget"
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 msgid "Glossy"
 msgstr "Glansig"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr "Textur"
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 msgid "Matte"
 msgstr "Matt"
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr "Laminatmönster"
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 msgid "Adjust the cyan balance"
 msgstr "Justera cyanbalansen"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 msgid "Adjust the magenta balance"
 msgstr "Justera magentabalansen"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 msgid "Adjust the yellow balance"
 msgstr "Justera gulbalansen"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 msgid "Black Balance"
 msgstr "Svartbalans"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 msgid "Adjust the black balance"
 msgstr "Justera svartbalansen"
 
@@ -1650,8 +1668,8 @@ msgstr "Färgpatroner + fotopatroner"
 msgid "PPDFile"
 msgstr "PPD-fil"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 msgid "PPD File"
 msgstr "PPD-fil"
 
@@ -1659,289 +1677,295 @@ msgstr "PPD-fil"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 msgid "Two Level Grayscale"
 msgstr "Tvånivås gråton"
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 msgid "Three Level Grayscale"
 msgstr "Trenivåers gråton"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr "Quadtone"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 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:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 msgid "Seven Color Photo"
 msgstr "Sjufärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 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:1649
+#: src/main/escp2-channels.c:1728
 msgid "Eight Color Photo"
 msgstr "Åttafärgers foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 msgid "One Color Raw"
 msgstr "Enfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 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:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 msgid "Two Color Raw"
 msgstr "Tvåfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 msgid "Three Color Raw"
 msgstr "Trefärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 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: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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 msgid "Four Color Raw"
 msgstr "Fyrfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 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:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 msgid "Five Color Raw"
 msgstr "Femfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 msgid "Six Color Raw"
 msgstr "Sexfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 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:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 msgid "Seven Color Raw"
 msgstr "Sjufärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 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:2205
+#: src/main/escp2-channels.c:2315
 msgid "Eight Color Raw"
 msgstr "Åttafärgers rå"
 
-#: 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr ""
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Sexfärgs foto"
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 msgid "Light Magenta"
 msgstr "Ljus magenta"
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 msgid "Light Black"
 msgstr "Ljus svart"
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 msgid "Dark Yellow"
 msgstr "Mörk gul"
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 msgid "Gloss Optimizer"
 msgstr "Glansoptimerare"
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr "Snabbladdning av vanligt papper"
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Vykort"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr "Bakljusfilm"
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 msgid "Matte Paper Heavyweight"
 msgstr "Matt tungt papper"
 
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium halvglansigt fotopapper"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 msgid "ColorLife Paper"
 msgstr "ColorLife-papper"
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matte-papper"
 
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr "Rullmatning"
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 msgid "Print to CD"
 msgstr "Skriv ut till cd"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manuell matning"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manuell matning"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Fack"
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 #, fuzzy
 msgid "Photo Board"
 msgstr "Fotosvart"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Välj automatiskt"
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr ""
 
@@ -2811,3383 +2835,3562 @@ msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
 #: src/main/xmli18n-tmp.h:164
+#, fuzzy
+msgid "Canon BJC-5100"
+msgstr "Canon BJC-1000"
+
+#: src/main/xmli18n-tmp.h:165
+#, fuzzy
+msgid "Canon BJC-5500"
+msgstr "Canon BJC-6500"
+
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:173
+#, fuzzy
+msgid "Canon BJC-8500"
+msgstr "Canon BJC-6500"
+
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:181
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:182
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:183
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:184
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:189
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "Epson Stylus CX3700"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "Epson Stylus CX4100"
+
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "Epson Stylus C20"
+
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "Epson Stylus DX4200"
+
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 #, fuzzy
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 #, fuzzy
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 #, fuzzy
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "Epson PM 700C"
+
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "Epson PM 780C"
+
+#: src/main/xmli18n-tmp.h:504
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 msgid "Generic PCL 4 Printer"
 msgstr "Allmän PCL 4-skrivare"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 msgid "Generic PCL 5 Printer"
 msgstr "Allmän PCL 5-skivare"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 msgid "Generic PCL 5c Printer"
 msgstr "Allmän PCL 5c-skivare"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 msgid "Generic PCL 5e Printer"
 msgstr "Allmän PCL 5e-skivare"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Allmän PCL 6/PCL XL-skrivare"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+#, fuzzy
+msgid "HP LaserJet 1022"
+msgstr "HP LaserJet 1012"
+
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr "Okidata OL400"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr "Okidata OL400e"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr "Okidata OL410e"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr "Okidata OL600e"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr "Okidata OL800"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+#, fuzzy
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-161"
+
+#: src/main/xmli18n-tmp.h:939
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 #, fuzzy
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+#, fuzzy
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:983
+#, fuzzy
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/main/xmli18n-tmp.h:985
+#, fuzzy
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/main/xmli18n-tmp.h:986
+#, fuzzy
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:987
+#, fuzzy
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/main/xmli18n-tmp.h:988
 #, fuzzy
 msgid "Sony DPP-EX5"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr "RÅ DATA 16-bitar"
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr "RÅ DATA 8-bitar"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "Tum"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "Ställ in grundenheten till tum"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Ställ in grundenheten till centimeter"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Points"
 msgstr "Punkter"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 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:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Ställ in grundenheten för mått till millimeter"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 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:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "Färgutdata"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 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:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Standard Command"
 msgstr "Standard kommando"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr "Använd standardkommando för utskrift"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Custom Command"
 msgstr "Anpassat kommando"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr "Använd anpassat kommando för utskrift"
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "Fil"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 msgid "Print to a file"
 msgstr "Skriv ut till en fil"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr "Redigera kurva..."
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 msgid "Set Default"
 msgstr "Ställ in standard"
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr "Återställ föregående"
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Utskrift v%s"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "Om"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6195,7 +6398,7 @@ msgstr ""
 "Skriv ut och\n"
 "spara inställningar"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6203,15 +6406,15 @@ msgstr ""
 "Spara\n"
 "inställningar"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "Förhandsgranskning"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6235,193 +6438,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:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 msgid "Paper Size"
 msgstr "Pappersstorlek"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr "Visa alla pappersstorlekar"
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "Dimensioner:"
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "Bredd:"
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 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:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "Höjd:"
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 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:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 msgid "Automatic Paper Size"
 msgstr "Automatisk pappersstorlek"
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr "Antal kopior"
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 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:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 msgid "Image Position"
 msgstr "Bildposition"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "Automatisk"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "Stående"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "Liggande"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "Uppochner"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "Liggande uppochner"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 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:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "Vänster:"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "Höger:"
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 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:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "Övre kant:"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 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:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "Nedre kant:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 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:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "Centrera:"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Horizontal"
 msgstr "Horisontal"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "Centrera bilden horisontellt på pappret"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "Både och"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "Centrera bilden på pappret"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "Centrera bilden vertikalt på pappret"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "Konfigurera skrivare"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 msgid "Printer Make:"
 msgstr "Skrivarmärke:"
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 msgid "Select the make of your printer"
 msgstr "Välj märke på din skrivare"
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "Skrivarmodell:"
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "Välj modell på din skrivare"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "PPD-fil:"
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Ange rätt PPD-filnamn för din skrivare"
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "Bläddra"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Välj rätt PPD-filnamn för din skrivare"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -6429,52 +6632,52 @@ msgstr ""
 "Välj namnet på utskriftskön (inte skrivarens typ eller modell) som du vill "
 "skriva ut på"
 
-#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 msgid "Printer Queue:"
 msgstr "Skrivarkö:"
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 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:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr "Ange filen att skriva till. "
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 msgid "File to print to"
 msgstr "Fil att skriva ut till"
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 msgid "Print To File"
 msgstr "Skriv ut till fil"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "Ange ny skrivare"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "Skrivarnamn:"
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 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:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 msgid "About Gutenprint "
 msgstr "Om Gutenprint "
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 msgid "Gutenprint Version "
 msgstr "Gutenprint version "
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "Skrivarinställningar"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6482,11 +6685,11 @@ msgstr ""
 "Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill "
 "skriva ut till"
 
-#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "Konfigurera skrivare..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6494,11 +6697,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:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "Ny skrivare..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6506,23 +6709,32 @@ 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:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Ställ in standardvärden"
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 msgid "Image Size"
 msgstr "Bildstorlek"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "Skalning:"
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "Ändra skalningen (storleken) på bilden"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr "Skala efter:"
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6530,31 +6742,31 @@ msgstr ""
 "Välj huruvida skalning mäts i procent av tillgänglig sidstorlek eller antal "
 "utdatapunkter per tum"
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "Skala utskriften till storleken på sidan"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "Punkter per tum"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr "Skala utskriften till antalet punkter per tum"
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "Ställ in bredden på utskriften"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "Ställ in bredden på utskriften"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6562,65 +6774,65 @@ msgstr ""
 "Använd\n"
 "originalbildstorlek"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 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:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "Justera utskriftsfärg"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr "Ställ in standardvärden"
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "Stäng"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "Förhandsgranskning av bild"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 msgid "Output"
 msgstr "Utdata"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr "Utdatatyp:"
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "Välj önskad typ av utdata"
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "Justera utdata..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 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:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 msgid "Size Units:"
 msgstr "Storleksenheter:"
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "Välj grundenheten för utskrift"
 
@@ -6653,11 +6865,11 @@ msgstr "Berkeley lpd (/usr/libexec/lpc)"
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 msgid "Printer"
 msgstr "Skrivare"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 msgid "(Default Printer)"
 msgstr "(Standardskrivare)"
 
@@ -6705,35 +6917,35 @@ msgstr "Maximalt möjligt värde för Y"
 msgid "_Gamma value"
 msgstr "_Gammavärde"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 msgid "Printer Features"
 msgstr "Skrivarfunktioner"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 msgid "Common"
 msgstr "Vanlig"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 msgid "Extra 5"
 msgstr "Extra 5"
 
@@ -6742,50 +6954,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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Swedish"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "Dubbelsidad utskrift"
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr "Nej"
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 #, fuzzy
 msgid "Value"
 msgstr "Blå"
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr "Finjustering"
 
@@ -6846,6 +7058,7 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\n"
 
 #: src/escputil/escputil.c:119
+#, fuzzy
 msgid ""
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
 "                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
@@ -6881,12 +7094,12 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
@@ -6936,7 +7149,7 @@ msgstr ""
 "    -C|--choices       Ange antalet mönsterval för justering\n"
 "    -p|--patterns      Ange antalet uppsättningar av mönster för justering\n"
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -7019,88 +7232,93 @@ msgstr ""
 "    -C Ange antalet mönsterval för justering\n"
 "    -p Ange antalet uppsättningar mönster för justering\n"
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr "Du kan endast ange en skrivare eller rå enhet."
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr "Du kan endast ange en skrivarmodell."
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr "Justeringsval måste vara åtminstone 1."
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "Okänd flagga %c\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr "Användning: %s [FLAGGOR] kommando\n"
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr "Skriv \"%s --help\" för mer information.\n"
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr "Skriv \"%s -h\" för mer information.\n"
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "Kan inte öppna enheten %s: %s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "Kan inte skicka kommando till skrivare\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr "Läsning från skrivaren fick timeout\n"
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan inte läsa från %s: %s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "Skrivarstatus kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan inte öppna %s för läsning och skrivning: %s\n"
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Okänd flagga %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan inte skriva till %s: %s\n"
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7109,7 +7327,7 @@ msgstr ""
 "\n"
 "Kan inte skriva till %s: %s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7120,214 +7338,212 @@ msgstr ""
 "Kan inte detektera skrivartyp.\n"
 "Använd flaggan -m för att ange din skrivarmodell.\n"
 
-#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr "Okänt"
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr "Status: Fel\n"
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Status: Upptagen\n"
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Status: Väntar\n"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Status: Overksam\n"
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Status: Pausad\n"
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Status: Rensar\n"
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Status: Stänger ner\n"
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Status: Okänt (%d)\n"
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Fel: Ödesdigert fel\n"
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Fel: Slut på bläck\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Fel: Slut på papper\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Fel: Kortläsningsfel\n"
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Fel: Okänt (%d)\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Skriver ut självtest av munstycke\n"
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Bläcknivåer:\n"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 msgstr "Bläckfärg"
 
-#: 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr "Återstående procent"
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr "Varning: Svart bläcknivå är låg\n"
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Varning: Okänt (%d)\n"
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr "Jobbnamn: "
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr "bläcknivåer"
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr "status"
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Få tag på %s kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Få tag på bläckinformation kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr "Datum"
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Skrivaridentifiering kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Kan inte identifiera skrivarmodellen.\n"
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Rensar huvuden...\n"
@@ -7486,7 +7702,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Kan inte skicka kommando till skrivaren, avslutar.\n"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr "Avslutar\n"
@@ -7512,7 +7728,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7601,9 +7817,9 @@ msgid "Final command was not confirmed.\n"
 msgstr "Sista kommandot bekräftades inte.\n"
 
 #: src/escputil/escputil.c:1908
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7617,12 +7833,12 @@ msgstr ""
 "Placera ett pappersark i skrivaren för att påbörja justeringen\n"
 "av huvudena.\n"
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "Tryck retur för att fortsätta > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7633,42 +7849,42 @@ msgstr ""
 "Skriv in ett parnummer, \"?\" för hjälp, eller \"r\" för att upprepa "
 "proceduren.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "Pass %d"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Mata in ett nytt pappersark.\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Numret är utanför intervallet!\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Jag kan inte förstå vad du skrev!\n"
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Det bästa linjeparet bör vara numrerat mellan 1 och %d.\n"
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Försöker ställa in justering..."
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "lyckades.\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7681,7 +7897,7 @@ msgstr ""
 "linje är mönster %d. Om det inte är det bör du upprepa proceduren för\n"
 "att få bästa utskriftskvalitet.\n"
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr "Fel i indata\n"
@@ -8703,9 +8919,6 @@ msgstr "FEL: ijsgutenprint: Hämtning av nästa rad misslyckades vid %.0f\n"
 #~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n"
 #~ msgstr "Parametern %s är utanför intervallet (värde %d, min %d, max %d)\n"
 
-#~ msgid "Unknown option %s\n"
-#~ msgstr "Okänd flagga %s\n"
-
 #~ msgid "13x19"
 #~ msgstr "13×19"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index a5bc981..95d0b71 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a1c6b66..712c9f8 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: 2007-06-17 11:45-0400\n"
+"POT-Creation-Date: 2008-01-01 20:47-0500\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:1737
+#: src/main/print-escp2.c:1752
 msgid "Default"
 msgstr "預設"
 
@@ -76,16 +76,16 @@ msgstr ""
 msgid "Density"
 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/dither-main.c:88 src/main/print-canon.c:295
+#: src/main/print-canon.c:303 src/main/print-canon.c:311
+#: src/main/print-canon.c:319 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/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
 #: 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:1626 src/main/print-olympus.c:1634
-#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1764 src/main/print-olympus.c:1772
+#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788
 #: 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"
@@ -142,26 +142,26 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "擬色運算方式"
 
-#: 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-canon.c:200 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699
 #: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 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-canon.c:200 src/main/print-canon.c:206
+#: src/main/print-canon.c:212 src/main/print-canon.c:218
+#: src/main/print-canon.c:224 src/main/print-canon.c:230
+#: src/main/print-canon.c:248 src/main/print-canon.c:272
+#: src/main/print-escp2.c:180 src/main/print-escp2.c:186
+#: src/main/print-escp2.c:192 src/main/print-escp2.c:198
+#: src/main/print-escp2.c:204 src/main/print-escp2.c:210
+#: src/main/print-escp2.c:228 src/main/print-escp2.c:245
+#: src/main/print-escp2.c:251 src/main/print-escp2.c:263
+#: src/main/print-escp2.c:281 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-lexmark.c:284 src/main/print-olympus.c:1699
+#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711
+#: src/main/print-olympus.c:1717 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
@@ -169,270 +169,271 @@ msgstr "頁面尺寸"
 msgid "Basic Printer Setup"
 msgstr "基本印表機設定"
 
-#: 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-canon.c:201 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700
 #: 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: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
+#: src/main/print-canon.c:206 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417
 msgid "Media Type"
 msgstr "紙張類別"
 
-#: 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-canon.c:207 src/main/print-escp2.c:187
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706
 #: 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: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
+#: src/main/print-canon.c:212 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445
 msgid "Media Source"
 msgstr "紙張來源"
 
-#: 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-canon.c:213 src/main/print-escp2.c:193
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712
 #: 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:216 src/main/print-escp2.c:197
+#: src/main/print-canon.c:218 src/main/print-escp2.c:198
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+#: src/main/print-canon.c:219 src/main/print-escp2.c:199
 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
+#: src/main/print-canon.c:224 src/main/print-escp2.c:204
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+#: src/main/print-canon.c:225 src/main/print-escp2.c:205
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#: src/main/print-canon.c:230 src/main/print-escp2.c:210
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#: src/main/print-canon.c:231 src/main/print-escp2.c:211
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "指定列印時的影像尺寸為頁面尺寸的某個百分比"
 
-#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+#: src/main/print-canon.c:236 src/main/print-escp2.c:216
 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-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-canon.c:254 src/main/print-escp2.c:216
+#: src/main/print-escp2.c:222 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729
+#: src/main/print-olympus.c:1735 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
+#: src/main/print-canon.c:237 src/main/print-canon.c:243
+#: src/main/print-escp2.c:217 src/main/print-escp2.c:223
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+#: src/main/print-canon.c:242 src/main/print-escp2.c:222
 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
+#: src/main/print-canon.c:248 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518
 msgid "Resolution"
 msgstr "解析度"
 
-#: 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-canon.c:249 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1718 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:252 src/main/print-escp2.c:238
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-canon.c:254 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723
 #: 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: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-canon.c:255 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1724 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:258 src/main/print-canon.c:259
-#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
+#: src/main/print-canon.c:260 src/main/print-canon.c:261
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: 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
+#: src/main/print-canon.c:260 src/main/print-escp2.c:130
+#: src/main/print-escp2.c:137 src/main/print-escp2.c:144
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:317
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296
+#: src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr "進階印表機功能"
 
-#: 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-canon.c:266 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741
 #: 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:264 src/main/print-color.c:184
+#: src/main/print-canon.c:266 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: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-color.c:208 src/main/print-escp2.c:341
+#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1741 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:265 src/main/print-escp2.c:335
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-canon.c:267 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742
 #: 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:270 src/main/print-pcl.c:1238
+#: src/main/print-canon.c:272 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "雙面列印"
 
-#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
+#: src/main/print-canon.c:273 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-canon.c:295 src/main/print-escp2.c:439
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 msgid "Cyan Density"
 msgstr "氰藍色密度"
 
-#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-canon.c:296 src/main/print-escp2.c:440
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr "調整氰藍色色彩密度"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:303 src/main/print-escp2.c:447
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 msgid "Magenta Density"
 msgstr "洋紅色密度"
 
-#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-canon.c:304 src/main/print-escp2.c:448
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr "調整洋紅色色彩密度"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:311 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 msgid "Yellow Density"
 msgstr "黃色密度"
 
-#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-canon.c:312 src/main/print-escp2.c:456
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr "調整黃色色彩密度"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:319 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 msgid "Black Density"
 msgstr "黑色密度"
 
-#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-canon.c:320 src/main/print-escp2.c:464
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr "調整黑色色彩密度"
 
-#: 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-canon.c:327 src/main/print-canon.c:328
+#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 msgid "Light Cyan Transition"
 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-canon.c:327 src/main/print-canon.c:335
+#: src/main/print-canon.c:343 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-escp2.c:543
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:559
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
 #: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: 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-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-canon.c:343 src/main/print-canon.c:344
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/print-canon.c:363 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:362 src/main/print-pcl.c:1483
+#: src/main/print-canon.c:364 src/main/print-pcl.c:1483
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+#: src/main/print-canon.c:365 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/print-canon.c:629 src/main/print-escp2.c:1648
 #: src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "5 吋光碟"
 
-#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/print-canon.c:631 src/main/print-escp2.c:1650
 #: src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "3 吋光碟"
 
-#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/print-canon.c:633 src/main/print-escp2.c:1652
 #: src/main/xmli18n-tmp.h:8
 #, fuzzy
 msgid "CD - Custom"
 msgstr "自選"
 
-#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+#: src/main/print-canon.c:656 src/main/print-escp2.c:1677
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#: src/main/print-canon.c:658 src/main/print-escp2.c:1679
 msgid "Print To Hub"
 msgstr ""
 
-#: 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-canon.c:773 src/main/print-escp2.c:2011
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996
 #: 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
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color"
 msgstr "彩色"
 
-#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-canon.c:775 src/main/print-escp2.c:2013
 #: 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"
@@ -470,9 +471,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:121 src/main/escp2-channels.c:916
+#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Grayscale"
 msgstr "灰階"
 
@@ -552,7 +553,7 @@ msgid "Output image type"
 msgstr "輸出影像類型"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:340
+#: src/main/print-escp2.c:347
 msgid "Raw Channels"
 msgstr ""
 
@@ -613,15 +614,16 @@ msgstr ""
 msgid "Gamma value assumed by application"
 msgstr "程式使用的 Gamma 值"
 
-#: 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
+#: src/main/print-color.c:266 src/main/escp2-channels.c:3048
+#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068
+#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089
+#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117
+#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138
+#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165
+#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194
+#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
+#: src/escputil/escputil.c:1201
 msgid "Cyan"
 msgstr "氰藍"
 
@@ -629,15 +631,16 @@ msgstr "氰藍"
 msgid "Adjust the cyan gamma"
 msgstr "調整氰藍色 gamma 值"
 
-#: 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
+#: src/main/print-color.c:274 src/main/escp2-channels.c:3049
+#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070
+#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090
+#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116
+#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139
+#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164
+#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195
+#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1202
 msgid "Magenta"
 msgstr "洋紅"
 
@@ -645,15 +648,16 @@ msgstr "洋紅"
 msgid "Adjust the magenta gamma"
 msgstr "調整洋紅色 gamma 值"
 
-#: 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
+#: src/main/print-color.c:282 src/main/escp2-channels.c:3050
+#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069
+#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091
+#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112
+#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140
+#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163
+#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196
+#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1203
 msgid "Yellow"
 msgstr "黃"
 
@@ -661,10 +665,10 @@ msgstr "黃"
 msgid "Adjust the yellow gamma"
 msgstr "調整黃色 gamma 值"
 
-#: 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
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3168
+#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180
+#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987
+#: src/escputil/escputil.c:1005
 msgid "Red"
 msgstr "紅"
 
@@ -672,8 +676,8 @@ msgstr "紅"
 msgid "Adjust the red gamma"
 msgstr "調整紅色 gamma 值"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
-#: src/gutenprintui2/panel.c:2176
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187
+#: src/gutenprintui2/panel.c:2188
 msgid "Green"
 msgstr "綠"
 
@@ -681,10 +685,10 @@ msgstr "綠"
 msgid "Adjust the green gamma"
 msgstr "調整綠色 gamma 值"
 
-#: 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
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3169
+#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194
+#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988
+#: src/escputil/escputil.c:1006
 msgid "Blue"
 msgstr "藍"
 
@@ -693,14 +697,16 @@ 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
+#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057
+#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071
+#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088
+#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113
+#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137
+#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156
+#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
+#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174
+#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
+#: src/escputil/escputil.c:1200
 msgid "Black"
 msgstr "黑"
 
@@ -708,7 +714,7 @@ msgstr "黑"
 msgid "Adjust the black gamma"
 msgstr "調整黑色 gamma 值"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1626
+#: src/main/print-color.c:322 src/main/print-olympus.c:1764
 msgid "Cyan Balance"
 msgstr "氰藍色平衡"
 
@@ -721,7 +727,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1634
+#: src/main/print-color.c:330 src/main/print-olympus.c:1772
 msgid "Magenta Balance"
 msgstr "洋紅色平衡"
 
@@ -729,7 +735,7 @@ msgstr "洋紅色平衡"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1642
+#: src/main/print-color.c:338 src/main/print-olympus.c:1780
 msgid "Yellow Balance"
 msgstr "黃色平衡"
 
@@ -755,9 +761,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: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
+#: src/main/print-color.c:545 src/main/print-escp2.c:353
+#: src/main/print-escp2.c:359 src/main/print-escp2.c:365
+#: src/main/print-escp2.c:371 src/main/print-escp2.c:377
 msgid "Advanced Output Control"
 msgstr ""
 
@@ -906,350 +912,361 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:506
+#: src/main/printers.c:517
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:519 src/main/printers.c:524
+#: src/main/printers.c:530 src/main/printers.c:535
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:543
+#: src/main/printers.c:554
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s 必須在 %f 和 %f 之間 (實際上是 %f)\n"
 
-#: src/main/printers.c:565 src/main/printers.c:589
+#: src/main/printers.c:576 src/main/printers.c:600
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s 必須在 %d 和 %d 之間 (實際上是 %d)\n"
 
-#: src/main/printers.c:620
+#: src/main/printers.c:631
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "%s 必須在 %f 和 %f 之間\n"
 
-#: src/main/printers.c:628
+#: src/main/printers.c:639
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:632
+#: src/main/printers.c:643
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:676
+#: src/main/printers.c:687
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr ""
 
-#: src/main/printers.c:689 src/main/printers.c:700
+#: src/main/printers.c:700 src/main/printers.c:711
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:761
+#: src/main/printers.c:772
 msgid "Page size is not valid\n"
 msgstr "頁面尺寸無效\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:793
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "頂部邊框寬度必須不少於 %d\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:799
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "左邊邊框寬度必須不少於 %d\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:805
 msgid "Height must be greater than zero\n"
 msgstr "高度必須大於零\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:811
 msgid "Width must be greater than zero\n"
 msgstr "寬度必須大於零\n"
 
-#: src/main/printers.c:806
+#: src/main/printers.c:817
 #, 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:813
+#: src/main/printers.c:824
 #, 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.c:161
+#: src/main/print-escp2.c:162
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:162
+#: src/main/print-escp2.c:163
 msgid "Automatic printing mode"
 msgstr "自動列印模式"
 
-#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
+#: src/main/print-escp2.c:174 src/main/print-escp2.c:175
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "列印品質"
 
-#: src/main/print-escp2.c:228
+#: src/main/print-escp2.c:229
 msgid "Resolution of the print"
 msgstr "列印時的解析度"
 
-#: src/main/print-escp2.c:244
+#: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:245
+#: src/main/print-escp2.c:246
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:250
+#: src/main/print-escp2.c:251
 msgid "Ink Set"
 msgstr ""
 
-#: src/main/print-escp2.c:256
+#: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "列印方向"
 
-#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
+#: src/main/print-escp2.c:257 src/main/print-escp2.c:269
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:257
+#: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
+#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:268
+#: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:269
+#: src/main/print-escp2.c:270
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:274
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:275
+#: src/main/print-escp2.c:276
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 msgid "Output Order"
 msgstr ""
 
-#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 msgid "Ink change command"
 msgstr ""
 
-#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
-#: src/main/print-escp2.c:317
+#: src/main/print-escp2.c:311 src/main/print-escp2.c:312
 msgid "Alternate Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:316
+#: src/main/print-escp2.c:317
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
+#: src/main/print-escp2.c:318
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:323
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:324
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 msgid "Channel Names"
 msgstr ""
 
-#: src/main/print-escp2.c:341
+#: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:346
+#: src/main/print-escp2.c:353
 msgid "Cyan Map"
 msgstr ""
 
-#: src/main/print-escp2.c:347
+#: src/main/print-escp2.c:354
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:352
+#: src/main/print-escp2.c:359
 msgid "Magenta Map"
 msgstr ""
 
-#: src/main/print-escp2.c:353
+#: src/main/print-escp2.c:360
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:358
+#: src/main/print-escp2.c:365
 msgid "Yellow Map"
 msgstr ""
 
-#: src/main/print-escp2.c:359
+#: src/main/print-escp2.c:366
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:364
+#: src/main/print-escp2.c:371
 msgid "Blue Map"
 msgstr ""
 
-#: src/main/print-escp2.c:365
+#: src/main/print-escp2.c:372
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:370
+#: src/main/print-escp2.c:377
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:371
+#: src/main/print-escp2.c:378
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr "紅色密度"
 
-#: src/main/print-escp2.c:465
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr "調整紅色色彩密度"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr "藍色密度"
 
-#: src/main/print-escp2.c:473
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr "調整藍色色彩密度"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:487
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:481
+#: src/main/print-escp2.c:488
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
-#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
+#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
-#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:544
+#: src/main/print-escp2.c:551
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:545
+#: src/main/print-escp2.c:552
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:1620
+#: src/main/print-escp2.c:1635
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1622
+#: src/main/print-escp2.c:1637
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1732 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 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/print-escp2.c:1771 src/main/print-escp2.c:1863
+#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707
+#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764
+#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857
+#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992
 #: 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
+#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639
 msgid "Standard"
 msgstr "標準"
 
-#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
+#: src/main/print-escp2.c:1842
 msgid "Automatic"
 msgstr "自動"
 
-#: src/main/print-escp2.c:1829
+#: src/main/print-escp2.c:1844
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1831
+#: src/main/print-escp2.c:1846
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1862
+#: src/main/print-escp2.c:1877
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1864
+#: src/main/print-escp2.c:1879
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1866
+#: src/main/print-escp2.c:1881
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1868
+#: src/main/print-escp2.c:1883
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1870
+#: src/main/print-escp2.c:1885
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2313
+#: src/main/print-escp2.c:2328
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
+#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1303,135 +1320,136 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
+#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
+#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
+#: src/main/escp2-channels.c:1382 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:1452
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
+#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
+#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
+#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
+#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
+#: src/main/escp2-channels.c:1266
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582
+#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823
+#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: 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
+#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489
+#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517
+#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767
+#: src/main/escp2-channels.c:1784
 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
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341
+#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
+#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
+#: src/main/escp2-papers.c:1569
 msgid "Plain Paper"
 msgstr "普通紙張"
 
 # (Abel) from Epson
-#: 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
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531
+#: src/main/escp2-papers.c:1575
 msgid "Glossy Film"
 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
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437
+#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533
+#: src/main/escp2-papers.c:1577
 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
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
+#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
+#: src/main/escp2-papers.c:1579
 msgid "Envelopes"
 msgstr "信封"
 
 # (Abel) from fuji, epson
-#: 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
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355
+#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539
+#: src/main/escp2-papers.c:1583
 msgid "Matte Paper"
 msgstr "雪面銅版紙"
 
 # (Abel) from Epson
-#: 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
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
+#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
+#: src/main/escp2-papers.c:1587
 msgid "Inkjet Paper"
 msgstr "噴墨專用紙"
 
 # (Abel) from Epson
-#: 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
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
+#: src/main/escp2-papers.c:1589
 msgid "Photo Quality Inkjet Paper"
 msgstr "優質噴墨專用紙"
 
-#: 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
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451
+#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547
+#: src/main/escp2-papers.c:1591
 msgid "Photo Paper"
 msgstr "相紙"
 
 # (Abel) from Epson
-#: 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
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
+#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617
 msgid "Premium Glossy Photo Paper"
 msgstr "頂級光面相紙"
 
 # (Abel) from Epson
-#: 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
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369
+#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
+#: src/main/escp2-papers.c:1597
 msgid "Premium Luster Photo Paper"
 msgstr "精選光面相紙"
 
 # (Abel) from Epson
-#: 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
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555
+#: src/main/escp2-papers.c:1603
 msgid "Photo Quality Glossy Paper"
 msgstr "光面紙"
 
-#: 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
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557
+#: src/main/escp2-papers.c:1605
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469
+#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561
+#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619
 msgid "Other"
 msgstr "其它"
 
@@ -1447,50 +1465,50 @@ msgstr ""
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-olympus.c:276
+#: src/main/print-olympus.c:277
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
-#: src/cups/genppd.c:1781
+#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753
+#: src/cups/genppd.c:1834
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
-#: src/main/print-olympus.c:1080
+#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023
+#: src/main/print-olympus.c:1127
 msgid "Glossy"
 msgstr "光面"
 
-#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
-#: src/main/print-olympus.c:1081
+#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024
+#: src/main/print-olympus.c:1128
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
+#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
+#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1627
+#: src/main/print-olympus.c:1765
 msgid "Adjust the cyan balance"
 msgstr "調整氰藍色色彩平衡"
 
-#: src/main/print-olympus.c:1635
+#: src/main/print-olympus.c:1773
 msgid "Adjust the magenta balance"
 msgstr "調整洋紅色色彩平衡"
 
-#: src/main/print-olympus.c:1643
+#: src/main/print-olympus.c:1781
 msgid "Adjust the yellow balance"
 msgstr "調整黃色色彩平衡"
 
-#: src/main/print-olympus.c:1650
+#: src/main/print-olympus.c:1788
 msgid "Black Balance"
 msgstr "黑色平衡"
 
-#: src/main/print-olympus.c:1651
+#: src/main/print-olympus.c:1789
 msgid "Adjust the black balance"
 msgstr "調整黑色色彩平衡"
 
@@ -1603,8 +1621,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "PPD 檔"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
-#: src/gutenprintui2/panel.c:1767
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768
+#: src/gutenprintui2/panel.c:1768
 msgid "PPD File"
 msgstr "PPD 檔"
 
@@ -1612,270 +1630,276 @@ msgstr "PPD 檔"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
+#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "灰階"
 
-#: 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
+#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
+#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
+#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
+#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
+#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
-#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
+#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655
+#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1612
+#: src/main/escp2-channels.c:1691
 msgid "Seven Color Enhanced"
 msgstr ""
 
-#: src/main/escp2-channels.c:1649
+#: src/main/escp2-channels.c:1728
 msgid "Eight Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
+#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888
+#: src/main/escp2-channels.c:1894
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1809
+#: src/main/escp2-channels.c:1900
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
+#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925
 msgid "Two Color Raw"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953
+#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019
+#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047
+#: src/main/escp2-channels.c:2060
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1876
+#: src/main/escp2-channels.c:1967
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073
+#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085
+#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2017
+#: src/main/escp2-channels.c:2127
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
+#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156
 msgid "Five Color Raw"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186
+#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198
+#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2109
+#: src/main/escp2-channels.c:2219
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
-#: src/main/escp2-channels.c:2170
+#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265
+#: src/main/escp2-channels.c:2280
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2187
+#: src/main/escp2-channels.c:2297
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2205
+#: src/main/escp2-channels.c:2315
 msgid "Eight Color Raw"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495
+#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517
+#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540
+#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580
+#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620
+#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638
+#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642
+#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674
+#: src/main/escp2-channels.c:2694
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
+#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739
 msgid "UltraChrome Photo Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
+#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
-#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796
+#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976
 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
+#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778
+#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986
 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
+#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102
+#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128
+#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154
+#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1204
 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
+#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104
+#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129
+#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
+#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:1205
 msgid "Light Magenta"
 msgstr ""
 
-#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
-#: src/escputil/escputil.c:991
+#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192
+#: src/escputil/escputil.c:985
 msgid "Light Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2981
+#: src/main/escp2-channels.c:3143
 msgid "Dark Yellow"
 msgstr ""
 
-#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990
 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
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387
+#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
+#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
 msgid "Plain Paper Fast Load"
 msgstr ""
 
-#: 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/escp2-papers.c:1345 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481
+#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "明信片"
 
-#: 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
+#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
+#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
+#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
 msgid "Back Light Film"
 msgstr ""
 
-#: 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
+#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401
+#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493
+#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585
 msgid "Matte Paper Heavyweight"
 msgstr ""
 
 # (Abel) from Epson
-#: 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
+#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
+#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
+#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
 msgid "Premium Semigloss Photo Paper"
 msgstr "頂級柔光相紙"
 
-#: 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
+#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515
+#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607
 msgid "ColorLife Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
-#: src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507
+#: src/main/escp2-papers.c:1599
 msgid "Archival Matte Paper"
 msgstr ""
 
 # (Abel) from Epson
-#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
-#: src/main/escp2-papers.c:1511
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509
+#: src/main/escp2-papers.c:1601
 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
+#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842
+#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926
+#: src/main/escp2-papers.c:2001
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824
 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
+#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833
+#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968
 msgid "Print to CD"
 msgstr "列印至光碟"
 
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "人手送紙"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "人手送紙"
 
-#: src/main/escp2-papers.c:1859
+#: src/main/escp2-papers.c:1950
 msgid "Rear Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1868
+#: src/main/escp2-papers.c:1959
 msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886
+#: src/main/escp2-papers.c:1977
 #, fuzzy
 msgid "Photo Board"
 msgstr "相紙"
 
-#: src/main/escp2-papers.c:1925
+#: src/main/escp2-papers.c:2016
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-papers.c:1934
+#: src/main/escp2-papers.c:2025
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-papers.c:1943
+#: src/main/escp2-papers.c:2034
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/escp2-papers.c:1952
+#: src/main/escp2-papers.c:2043
 msgid "Manual Selection"
 msgstr ""
 
@@ -2761,3849 +2785,4027 @@ msgstr "Canon BJC 4300"
 
 #: src/main/xmli18n-tmp.h:164
 #, fuzzy
+msgid "Canon BJC-5100"
+msgstr "Canon BJC 1000"
+
+#: src/main/xmli18n-tmp.h:165
+#, fuzzy
+msgid "Canon BJC-5500"
+msgstr "Canon BJC 6500"
+
+#: src/main/xmli18n-tmp.h:166
+#, fuzzy
 msgid "Canon BJC-6000"
 msgstr "Canon BJC 6000"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:167
 #, fuzzy
 msgid "Canon BJC-6100"
 msgstr "Canon BJC 6100"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:168
 #, fuzzy
 msgid "Canon BJC-6200"
 msgstr "Canon BJC 6200"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:169
 #, fuzzy
 msgid "Canon BJC-6500"
 msgstr "Canon BJC 6500"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "Canon BJC-7000"
 msgstr "Canon BJC 7000"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "Canon BJC-7100"
 msgstr "Canon BJC 7100"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
 #, fuzzy
 msgid "Canon BJC-8200"
 msgstr "Canon BJC 8200"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:173
+#, fuzzy
+msgid "Canon BJC-8500"
+msgstr "Canon BJC 6500"
+
+#: src/main/xmli18n-tmp.h:174
 #, fuzzy
 msgid "Canon S100"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
 #, fuzzy
 msgid "Canon S200"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "Canon S300"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:179
 #, fuzzy
 msgid "Canon S500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:180
 #, fuzzy
 msgid "Canon S600"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:181
 #, fuzzy
 msgid "Canon S630"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:182
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:183
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:184
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:189
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA iP4500"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA iP5300"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA iP8500"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA iX5000"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA Pro9500"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP170"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXMA MP180"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon PIXMA MP610"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon PIXMA MP710"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:206
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:207
+#, fuzzy
+msgid "Canon PIXMA MP740"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:216
+#, fuzzy
+msgid "Canon i80"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC 85"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "EPSON Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "EPSON Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "EPSON Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "EPSON Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "EPSON Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "EPSON Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "EPSON Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "EPSON Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "EPSON Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "EPSON Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "EPSON Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "EPSON Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "EPSON Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "EPSON Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "EPSON Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "EPSON Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "EPSON Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "EPSON Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "EPSON Stylus C45"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "EPSON Stylus C45"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "EPSON Stylus C50"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "EPSON Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "EPSON Stylus C61"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "EPSON Stylus C62"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "EPSON Stylus C63"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "EPSON Stylus C64"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "EPSON Stylus C65"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "EPSON Stylus C66"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "EPSON Stylus C82"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "EPSON Stylus C83"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "EPSON Stylus C84"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "EPSON Stylus C85"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "EPSON Stylus C86"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "EPSON Stylus C45"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:261
+#, fuzzy
+msgid "Epson Stylus C110"
+msgstr "EPSON Stylus C20UX"
+
+#: src/main/xmli18n-tmp.h:262
+#, fuzzy
+msgid "Epson Stylus C120"
+msgstr "EPSON Stylus C20UX"
+
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "EPSON Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "EPSON Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "EPSON Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "EPSON Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "EPSON Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "EPSON Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "EPSON Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "EPSON Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "EPSON Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "EPSON Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "EPSON Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "EPSON Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "EPSON Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "EPSON Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "EPSON Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "EPSON Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "EPSON Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "EPSON Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "EPSON Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "EPSON Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "EPSON Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "EPSON Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "EPSON Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "EPSON Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "EPSON Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "EPSON Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "EPSON Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "EPSON Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "EPSON Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "EPSON Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "EPSON Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "EPSON Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "EPSON Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "EPSON Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "EPSON Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "EPSON Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "EPSON Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "EPSON Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "EPSON Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "EPSON Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "EPSON Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "EPSON Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "EPSON Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "EPSON Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "EPSON Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "EPSON Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "EPSON Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "EPSON Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "EPSON Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "EPSON Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "EPSON Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "EPSON Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "EPSON Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "EPSON Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "EPSON Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "EPSON Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "EPSON Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "EPSON Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:334
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:335
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "EPSON Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:336
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "EPSON Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:340
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "EPSON Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "EPSON Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "EPSON Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:353
+#, fuzzy
+msgid "Epson Stylus Photo RX595"
+msgstr "EPSON Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "EPSON Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "EPSON Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "EPSON Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "EPSON Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "EPSON Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "EPSON Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "EPSON Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "EPSON Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "EPSON Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "EPSON Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "EPSON Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "EPSON Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "EPSON Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "EPSON Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "EPSON Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "EPSON Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "EPSON Stylus C85"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX4400"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:390
+#, fuzzy
+msgid "Epson Stylus CX4900"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "EPSON Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "EPSON Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "EPSON Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "EPSON Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:397
+#, fuzzy
+msgid "Epson Stylus CX5600"
+msgstr "EPSON Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:398
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "EPSON Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:399
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:400
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "EPSON Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:401
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "EPSON Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:402
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "EPSON Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:403
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "EPSON Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:404
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "EPSON Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "EPSON Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson Stylus CX7400"
+msgstr "EPSON Stylus CX8300"
+
+#: src/main/xmli18n-tmp.h:407
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:408
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:409
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "EPSON Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:410
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:411
+#, fuzzy
+msgid "Epson Stylus CX9400"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:412
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:413
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:414
+#, fuzzy
+msgid "Epson Stylus D120"
+msgstr "EPSON Stylus C20UX"
+
+#: src/main/xmli18n-tmp.h:415
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:416
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "EPSON Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:417
+#, fuzzy
+msgid "Epson Stylus DX4050"
+msgstr "EPSON Stylus CX3200"
+
+#: src/main/xmli18n-tmp.h:418
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:419
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "EPSON Stylus C50"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:420
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "EPSON PM-2000C"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "EPSON PM-G720"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "EPSON PM-740C"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "EPSON PM-750C"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "EPSON PM-780C"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:431
 #, fuzzy
 msgid "Epson CL 700"
 msgstr "Canon BJC 7000"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:437
 #, fuzzy
 msgid "Epson EM 900C"
 msgstr "EPSON EM-900C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:438
 #, fuzzy
 msgid "Epson EM 930C"
 msgstr "EPSON EM-930C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:439
 #, fuzzy
 msgid "Epson MC 2000"
 msgstr "Canon BJC 2000"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:440
 #, fuzzy
 msgid "Epson MC 5000"
 msgstr "EPSON MC-5000"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:441
 #, fuzzy
 msgid "Epson MC 7000"
 msgstr "Canon BJC 7000"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:442
 #, fuzzy
 msgid "Epson MC 9000"
 msgstr "EPSON MC-9000"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:443
 #, fuzzy
 msgid "Epson MC 10000"
 msgstr "Canon BJC 1000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:444
 #, fuzzy
 msgid "Epson MJ 930C"
 msgstr "EPSON MJ-930C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:445
 #, fuzzy
 msgid "Epson MJ 5100C"
 msgstr "EPSON MJ-5100C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:446
 #, fuzzy
 msgid "Epson MJ 6000C"
 msgstr "Canon BJC 6000"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:447
 #, fuzzy
 msgid "Epson MJ 8000C"
 msgstr "EPSON MJ-8000C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:448
+#, fuzzy
+msgid "Epson PM 670C"
+msgstr "EPSON PM-700C"
+
+#: src/main/xmli18n-tmp.h:449
 #, fuzzy
 msgid "Epson PM 700C"
 msgstr "EPSON PM-700C"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:450
 #, fuzzy
 msgid "Epson PM 730C"
 msgstr "EPSON PM-730C"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:451
 #, fuzzy
 msgid "Epson PM 740C"
 msgstr "EPSON PM-740C"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:452
 #, fuzzy
 msgid "Epson PM 750C"
 msgstr "EPSON PM-750C"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:453
 #, fuzzy
 msgid "Epson PM 760C"
 msgstr "EPSON PM-760C"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:454
 #, fuzzy
 msgid "Epson PM 770C"
 msgstr "EPSON PM-770C"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:455
 #, fuzzy
 msgid "Epson PM 780C"
 msgstr "EPSON PM-780C"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:456
 #, fuzzy
 msgid "Epson PM 790PT"
 msgstr "EPSON PM-790PT"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:457
 #, fuzzy
 msgid "Epson PM 800C"
 msgstr "EPSON PM-800C"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:458
 #, fuzzy
 msgid "Epson PM 850PT"
 msgstr "EPSON PM-850PT"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:459
 #, fuzzy
 msgid "Epson PM 870C"
 msgstr "EPSON PM-870C"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:460
 #, fuzzy
 msgid "Epson PM 880C"
 msgstr "EPSON PM-880C"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:461
 #, fuzzy
 msgid "Epson PM 930C"
 msgstr "EPSON PM-930C"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:462
 #, fuzzy
 msgid "Epson PM 940C"
 msgstr "EPSON PM-940C"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:463
 #, fuzzy
 msgid "Epson PM 950C"
 msgstr "EPSON PM-950C"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:464
 #, fuzzy
 msgid "Epson PM 970C"
 msgstr "EPSON PM-970C"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:465
 #, fuzzy
 msgid "Epson PM 980C"
 msgstr "EPSON PM-980C"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:466
 #, fuzzy
 msgid "Epson PM 2000C"
 msgstr "EPSON PM-2000C"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:467
 #, fuzzy
 msgid "Epson PM 2200C"
 msgstr "EPSON PM-2200C"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:468
 #, fuzzy
 msgid "Epson PM 3000C"
 msgstr "EPSON PM-3000C"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:469
 #, fuzzy
 msgid "Epson PM 3300C"
 msgstr "EPSON PM-3300C"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:470
 #, fuzzy
 msgid "Epson PM 3500C"
 msgstr "EPSON PM-3500C"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:471
 #, fuzzy
 msgid "Epson PM 3700C"
 msgstr "EPSON PM-3700C"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:472
 #, fuzzy
 msgid "Epson PM 4000PX"
 msgstr "EPSON PM-4000PX"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:473
 #, fuzzy
 msgid "Epson PM 5000C"
 msgstr "EPSON PM-5000C"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:474
 #, fuzzy
 msgid "Epson PM 7000C"
 msgstr "EPSON PM-7000C"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:475
 #, fuzzy
 msgid "Epson PM 9000C"
 msgstr "EPSON PM-9000C"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "EPSON PM-10000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "EPSON PM-G820"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:481
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "EPSON PM-9000C"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:482
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:483
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:484
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "EPSON PM-D750"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:485
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "EPSON PM-D770"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:486
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:487
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "EPSON PM-870C"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:488
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "EPSON PM-D1000"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:489
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "EPSON PM-G700"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:490
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "EPSON PM-G720"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:491
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:492
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "EPSON PM-G800"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:493
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "EPSON PM-G820"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:494
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "EPSON PM-G800"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:495
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "EPSON PM-G700"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:496
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "EPSON PX-V600"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:497
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "EPSON PX-G900"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:498
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "EPSON PX-G920"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:499
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "EPSON PX-G5000"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:500
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "EPSON PX-V500"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:501
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "EPSON PX-V600"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:502
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:503
+#, fuzzy
+msgid "Epson PX V780"
+msgstr "EPSON PM-780C"
+
+#: src/main/xmli18n-tmp.h:504
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "EPSON PX-V500"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:505
 #, fuzzy
 msgid "Epson PX 7000"
 msgstr "EPSON PX-7000"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:506
 #, fuzzy
 msgid "Epson PX 9000"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:507
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:508
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:509
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:510
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:511
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:512
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:513
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:514
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:515
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:516
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:517
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:518
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:519
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:520
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:521
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:522
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:523
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:524
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:525
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:526
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:527
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:528
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:529
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:530
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:531
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:532
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:533
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:534
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:535
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:536
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:537
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:538
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:539
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:540
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:541
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:542
 #, fuzzy
 msgid "Canon GP 335"
 msgstr "Canon BJC 85"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:543
 #, fuzzy
 msgid "Canon LBP-4sx"
 msgstr "Canon BJC 240"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:544
 #, fuzzy
 msgid "Canon LBP-430"
 msgstr "Canon BJC 4300"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:545
 #, fuzzy
 msgid "Canon LBP-1000"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:546
 #, fuzzy
 msgid "Canon LBP-1260"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:547
 #, fuzzy
 msgid "Canon LBP-1760"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:548
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:549
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:550
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:551
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:552
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:553
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:554
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:555
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:556
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:557
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:558
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:559
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:560
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:561
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:562
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:563
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:564
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:565
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:566
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:567
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:568
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:569
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:570
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:571
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:572
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:573
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:574
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:575
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "定義新的印表機"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:576
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "定義新的印表機"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:577
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "定義新的印表機"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:578
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "定義新的印表機"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:579
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:580
 #, fuzzy
 msgid "HP Business Inkjet 2200"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:581
 #, fuzzy
 msgid "HP Business Inkjet 2230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:582
 #, fuzzy
 msgid "HP Business Inkjet 2250"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:583
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:584
 #, fuzzy
 msgid "HP Business Inkjet 2280"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:585
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:586
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:587
 #, fuzzy
 msgid "HP Color LaserJet 2500"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:588
 #, fuzzy
 msgid "HP Color LaserJet 4500"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:589
 #, fuzzy
 msgid "HP Color LaserJet 4550"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:590
 #, fuzzy
 msgid "HP Color LaserJet 4600"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:591
 #, fuzzy
 msgid "HP Color LaserJet 5"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:592
 #, fuzzy
 msgid "HP Color LaserJet 5000"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:593
 #, fuzzy
 msgid "HP Color LaserJet 5500"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:594
 #, fuzzy
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:602
 #, fuzzy
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:604
 #, fuzzy
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500C"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:605
 #, fuzzy
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500C"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:606
 #, fuzzy
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:608
 #, fuzzy
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:609
 #, fuzzy
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:612
 #, fuzzy
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:613
 #, fuzzy
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:617
 #, fuzzy
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:618
 #, fuzzy
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:620
 #, fuzzy
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:621
 #, fuzzy
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:622
 #, fuzzy
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:623
 #, fuzzy
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:624
 #, fuzzy
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:625
 #, fuzzy
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:626
 #, fuzzy
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:627
 #, fuzzy
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:628
 #, fuzzy
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:629
 #, fuzzy
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:630
 #, fuzzy
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:631
 #, fuzzy
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:632
 #, fuzzy
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:633
 #, fuzzy
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:634
 #, fuzzy
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:635
 #, fuzzy
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:636
 #, fuzzy
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:637
 #, fuzzy
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:638
 #, fuzzy
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:639
 #, fuzzy
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:640
 #, fuzzy
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:643
 #, fuzzy
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:644
 #, fuzzy
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:645
 #, fuzzy
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:646
 #, fuzzy
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:647
 #, fuzzy
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:649
 #, fuzzy
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:651
 #, fuzzy
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:656
 #, fuzzy
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:657
 #, fuzzy
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:660
 #, fuzzy
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:661
 #, fuzzy
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:662
 #, fuzzy
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:663
 #, fuzzy
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:664
 #, fuzzy
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:665
 #, fuzzy
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:666
 #, fuzzy
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:667
 #, fuzzy
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:668
 #, fuzzy
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:669
 #, fuzzy
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:670
 #, fuzzy
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:671
 #, fuzzy
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:672
 #, fuzzy
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:673
 #, fuzzy
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:674
 #, fuzzy
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:675
 #, fuzzy
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:676
 #, fuzzy
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:677
 #, fuzzy
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:678
 #, fuzzy
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:679
 #, fuzzy
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:680
 #, fuzzy
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:681
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:682
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:683
 #, fuzzy
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:684
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:685
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:686
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:687
 #, fuzzy
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:688
 #, fuzzy
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:689
 #, fuzzy
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:690
 #, fuzzy
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:691
 #, fuzzy
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:692
 #, fuzzy
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:693
 #, fuzzy
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:694
 #, fuzzy
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:695
 #, fuzzy
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:696
 #, fuzzy
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:697
 #, fuzzy
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:698
 #, fuzzy
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet IIP 系列"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:699
 #, fuzzy
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:700
 #, fuzzy
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:701
 #, fuzzy
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:702
 #, fuzzy
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:703
 #, fuzzy
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:704
 #, fuzzy
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:705
 #, fuzzy
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:707
 #, fuzzy
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:708
 #, fuzzy
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:709
 #, fuzzy
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:712
 #, fuzzy
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:713
 #, fuzzy
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:714
 #, fuzzy
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:715
 #, fuzzy
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:716
 #, fuzzy
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:718
 #, fuzzy
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:719
 #, fuzzy
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:720
 #, fuzzy
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:721
 #, fuzzy
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:722
 #, fuzzy
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:723
 #, fuzzy
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:724
 #, fuzzy
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:725
+#, fuzzy
+msgid "HP LaserJet 1022"
+msgstr "HP LaserJet 4L"
+
+#: src/main/xmli18n-tmp.h:726
 #, fuzzy
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:727
 #, fuzzy
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:728
 #, fuzzy
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:729
 #, fuzzy
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:730
 #, fuzzy
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:731
 #, fuzzy
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:732
 #, fuzzy
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:733
 #, fuzzy
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:734
 #, fuzzy
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:735
 #, fuzzy
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:736
 #, fuzzy
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:737
 #, fuzzy
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:738
 #, fuzzy
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:739
 #, fuzzy
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:740
 #, fuzzy
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:741
 #, fuzzy
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:742
 #, fuzzy
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:743
 #, fuzzy
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:744
 #, fuzzy
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:745
 #, fuzzy
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:746
 #, fuzzy
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:747
 #, fuzzy
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:748
 #, fuzzy
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:749
 #, fuzzy
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:750
 #, fuzzy
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:751
 #, fuzzy
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:752
 #, fuzzy
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:753
 #, fuzzy
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:754
 #, fuzzy
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:755
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:756
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:757
 #, fuzzy
 msgid "HP OfficeJet 300"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:758
 #, fuzzy
 msgid "HP OfficeJet 330"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:759
 #, fuzzy
 msgid "HP OfficeJet 350"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:760
 #, fuzzy
 msgid "HP OfficeJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:761
 #, fuzzy
 msgid "HP OfficeJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:762
 #, fuzzy
 msgid "HP OfficeJet 570"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:763
 #, fuzzy
 msgid "HP OfficeJet 580"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:764
 #, fuzzy
 msgid "HP OfficeJet 590"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:765
 #, fuzzy
 msgid "HP OfficeJet 600"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:766
 #, fuzzy
 msgid "HP OfficeJet 610"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:767
 #, fuzzy
 msgid "HP OfficeJet 625"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:768
 #, fuzzy
 msgid "HP OfficeJet 630"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:769
 #, fuzzy
 msgid "HP OfficeJet 635"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:770
 #, fuzzy
 msgid "HP OfficeJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:771
 #, fuzzy
 msgid "HP OfficeJet 710"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:772
 #, fuzzy
 msgid "HP OfficeJet 720"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:773
 #, fuzzy
 msgid "HP OfficeJet 725"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:774
 #, fuzzy
 msgid "HP OfficeJet 5105"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:775
 #, fuzzy
 msgid "HP OfficeJet 5110"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:776
 #, fuzzy
 msgid "HP OfficeJet 5110xi"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:777
 #, fuzzy
 msgid "HP OfficeJet 6105"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:778
 #, fuzzy
 msgid "HP OfficeJet 6110"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:779
 #, fuzzy
 msgid "HP OfficeJet 7110"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:780
 #, fuzzy
 msgid "HP OfficeJet 7130"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:781
 #, fuzzy
 msgid "HP OfficeJet 7140"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:782
 #, fuzzy
 msgid "HP OfficeJet D125"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:783
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:784
 #, fuzzy
 msgid "HP OfficeJet D145"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:785
 #, fuzzy
 msgid "HP OfficeJet D155"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:786
 #, fuzzy
 msgid "HP OfficeJet G55"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:787
 #, fuzzy
 msgid "HP OfficeJet G85"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:788
 #, fuzzy
 msgid "HP OfficeJet G95"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:789
 #, fuzzy
 msgid "HP OfficeJet K60"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:790
 #, fuzzy
 msgid "HP OfficeJet K60xi"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:791
 #, fuzzy
 msgid "HP OfficeJet K80"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:792
 #, fuzzy
 msgid "HP OfficeJet K80xi"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:793
 #, fuzzy
 msgid "HP OfficeJet LX"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:794
 #, fuzzy
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:795
 #, fuzzy
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:796
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:797
 #, fuzzy
 msgid "HP OfficeJet R40"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:798
 #, fuzzy
 msgid "HP OfficeJet R45"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:799
 #, fuzzy
 msgid "HP OfficeJet R60"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:800
 #, fuzzy
 msgid "HP OfficeJet R65"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:801
 #, fuzzy
 msgid "HP OfficeJet R80"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:802
 #, fuzzy
 msgid "HP OfficeJet T45"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:803
 #, fuzzy
 msgid "HP OfficeJet T65"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:804
 #, fuzzy
 msgid "HP OfficeJet V40"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:805
 #, fuzzy
 msgid "HP OfficeJet V40xi"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:806
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:807
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:808
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:809
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:810
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:811
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:812
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:813
 #, fuzzy
 msgid "HP PSC 2110"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:814
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:815
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:816
 #, fuzzy
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:817
 #, fuzzy
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:818
 #, fuzzy
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:819
 #, fuzzy
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:820
 #, fuzzy
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:821
 #, fuzzy
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:822
 #, fuzzy
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:823
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:824
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:825
 #, fuzzy
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:826
 #, fuzzy
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:827
 #, fuzzy
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:828
 #, fuzzy
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:829
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:830
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:831
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:832
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:833
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:834
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:835
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:855
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:856
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:857
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:858
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:859
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:860
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:861
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:862
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:863
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:864
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:865
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:866
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:867
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:868
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:869
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:870
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:871
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:872
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:873
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:874
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:875
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:876
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:877
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:878
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:879
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:880
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:881
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:882
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:883
 #, fuzzy
 msgid "Lexmark Optra E"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:884
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:885
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:886
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:887
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:888
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:889
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:890
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:891
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:892
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:893
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:894
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:895
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:896
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:897
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:898
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:899
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:900
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:901
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:902
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:903
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:904
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:905
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:906
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:907
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:908
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:909
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:910
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:911
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:912
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:913
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:914
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:915
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:916
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:917
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:918
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:919
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/main/xmli18n-tmp.h:920
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/main/xmli18n-tmp.h:921
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/main/xmli18n-tmp.h:922
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/main/xmli18n-tmp.h:923
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/main/xmli18n-tmp.h:924
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/main/xmli18n-tmp.h:925
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/main/xmli18n-tmp.h:926
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/main/xmli18n-tmp.h:927
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/main/xmli18n-tmp.h:928
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/main/xmli18n-tmp.h:929
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/main/xmli18n-tmp.h:930
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/main/xmli18n-tmp.h:931
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/main/xmli18n-tmp.h:932
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/main/xmli18n-tmp.h:933
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/main/xmli18n-tmp.h:934
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/main/xmli18n-tmp.h:935
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/main/xmli18n-tmp.h:936
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/main/xmli18n-tmp.h:937
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/main/xmli18n-tmp.h:938
+msgid "Sharp AR-M257"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:939
 #, fuzzy
 msgid "Sony IJP-V100"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/main/xmli18n-tmp.h:940
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/main/xmli18n-tmp.h:941
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "設定印表機"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/main/xmli18n-tmp.h:942
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/main/xmli18n-tmp.h:943
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/main/xmli18n-tmp.h:944
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/main/xmli18n-tmp.h:945
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/main/xmli18n-tmp.h:946
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/main/xmli18n-tmp.h:947
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/main/xmli18n-tmp.h:948
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/main/xmli18n-tmp.h:949
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/main/xmli18n-tmp.h:950
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/main/xmli18n-tmp.h:951
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/main/xmli18n-tmp.h:952
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/main/xmli18n-tmp.h:953
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/main/xmli18n-tmp.h:954
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/main/xmli18n-tmp.h:955
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/main/xmli18n-tmp.h:956
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/main/xmli18n-tmp.h:957
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/main/xmli18n-tmp.h:958
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/main/xmli18n-tmp.h:959
 #, fuzzy
 msgid "Olympus P-10"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/main/xmli18n-tmp.h:960
 #, fuzzy
 msgid "Olympus P-11"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/main/xmli18n-tmp.h:961
 #, fuzzy
 msgid "Olympus P-200"
 msgstr "Olympus P200"
 
-#: src/main/xmli18n-tmp.h:934
+#: src/main/xmli18n-tmp.h:962
 #, fuzzy
 msgid "Olympus P-300"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:935
+#: src/main/xmli18n-tmp.h:963
 #, fuzzy
 msgid "Olympus P-300E"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:936
+#: src/main/xmli18n-tmp.h:964
 #, fuzzy
 msgid "Olympus P-300U"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:937
+#: src/main/xmli18n-tmp.h:965
 #, fuzzy
 msgid "Olympus P-330E"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:938
+#: src/main/xmli18n-tmp.h:966
 #, fuzzy
 msgid "Olympus P-330NE"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:939
+#: src/main/xmli18n-tmp.h:967
 #, fuzzy
 msgid "Olympus P-400"
 msgstr "Olympus P400"
 
-#: src/main/xmli18n-tmp.h:940
+#: src/main/xmli18n-tmp.h:968
 #, fuzzy
 msgid "Olympus P-440"
 msgstr "Olympus P440"
 
-#: src/main/xmli18n-tmp.h:941
+#: src/main/xmli18n-tmp.h:969
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:942
+#: src/main/xmli18n-tmp.h:970
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:943
+#: src/main/xmli18n-tmp.h:971
 #, fuzzy
 msgid "Canon CP-100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:944
+#: src/main/xmli18n-tmp.h:972
 #, fuzzy
 msgid "Canon CP-200"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:945
+#: src/main/xmli18n-tmp.h:973
 #, fuzzy
 msgid "Canon CP-220"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:946
+#: src/main/xmli18n-tmp.h:974
 #, fuzzy
 msgid "Canon CP-300"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:947
+#: src/main/xmli18n-tmp.h:975
 #, fuzzy
 msgid "Canon CP-330"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:948
+#: src/main/xmli18n-tmp.h:976
 #, fuzzy
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:949
+#: src/main/xmli18n-tmp.h:977
 #, fuzzy
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:950
+#: src/main/xmli18n-tmp.h:978
 #, fuzzy
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:951
+#: src/main/xmli18n-tmp.h:979
 #, fuzzy
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:952
+#: src/main/xmli18n-tmp.h:980
 #, fuzzy
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:953
+#: src/main/xmli18n-tmp.h:981
+#, fuzzy
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:982
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:983
+#, fuzzy
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:984
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:985
+#, fuzzy
+msgid "Canon SELPHY ES1"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:986
+#, fuzzy
+msgid "Canon SELPHY ES2"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:987
+#, fuzzy
+msgid "Canon SELPHY ES20"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:988
 #, fuzzy
 msgid "Sony DPP-EX5"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:954
+#: src/main/xmli18n-tmp.h:989
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
+#: src/main/xmli18n-tmp.h:990
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:956
+#: src/main/xmli18n-tmp.h:991
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:957
+#: src/main/xmli18n-tmp.h:992
 #, fuzzy
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:958
+#: src/main/xmli18n-tmp.h:993
 #, fuzzy
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/main/xmli18n-tmp.h:959
+#: src/main/xmli18n-tmp.h:994
 #, fuzzy
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix CX-550"
 
-#: src/main/xmli18n-tmp.h:960
+#: src/main/xmli18n-tmp.h:995
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/main/xmli18n-tmp.h:961
+#: src/main/xmli18n-tmp.h:996
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
+#: src/main/xmli18n-tmp.h:997
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:998
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
+#: src/main/xmli18n-tmp.h:999
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Inch"
 msgstr "英吋"
 
-#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to inches"
 msgstr "以英吋作為長度單位"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "cm"
 msgstr "公分"
 
-#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to centimetres"
 msgstr "以公分作為長度單位"
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Points"
 msgstr ""
 
-#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "mm"
 msgstr "毫米"
 
-#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
+#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280
 msgid "Set the base unit of measurement to millimetres"
 msgstr "以毫米作為長度單位"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Pica"
 msgstr "鉛點"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "以鉛點 (1/12\") 作為長度單位"
 
-#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Color output"
 msgstr "使用彩色列印"
 
-#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
+#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291
 msgid "Print in shades of gray using black ink"
 msgstr "使用黑色墨水來列印灰階色彩"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Standard Command"
 msgstr "標準指令"
 
-#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use standard print command"
 msgstr "使用標準列印指令"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Custom Command"
 msgstr "自選指令"
 
-#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Use custom print command"
 msgstr "使用自行指定的列印指令"
 
-#: 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
+#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704
+#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305
+#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790
 msgid "File"
 msgstr "檔案"
 
-#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
+#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305
 msgid "Print to a file"
 msgstr "列印至檔案"
 
-#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
+#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
+#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532
 msgid "Set Default"
 msgstr ""
 
-#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
+#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532
+#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819
+#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533
+#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819
 msgid "OK"
 msgstr "確定"
 
-#: 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
+#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197
+#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198
+#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- 列印增效模組 %s 版本"
 
-#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid "About"
 msgstr "關於"
 
-#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6611,7 +6813,7 @@ msgstr ""
 "列印並\n"
 "儲存設定"
 
-#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
+#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194
 msgid ""
 "Save\n"
 "Settings"
@@ -6619,15 +6821,15 @@ msgstr ""
 "儲存\n"
 "設定"
 
-#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
+#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196
 msgid "Print"
 msgstr "列印"
 
-#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
+#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248
 msgid "Preview"
 msgstr "預覽"
 
-#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
+#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6649,315 +6851,323 @@ msgstr ""
 "拖曳影像時按下 shift 鍵，會限制影像只向水平或垂直方向移動。\n"
 "如果拖曳的時候再按多一個滑鼠按鈕，影像會還原至原來位置。"
 
-#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
+#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320
 msgid "Paper Size"
 msgstr "紙張尺寸"
 
-#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Show All Paper Sizes"
 msgstr "顯示所有紙張尺寸"
 
-#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Dimensions:"
 msgstr "尺寸："
 
-#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
-#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063
+#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063
 msgid "Width:"
 msgstr "寬度："
 
-#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
+#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365
 msgid "Width of the paper that you wish to print to"
 msgstr "列印時的紙張寬度"
 
-#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
-#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065
+#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065
 msgid "Height:"
 msgstr "高度："
 
-#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
+#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370
 msgid "Height of the paper that you wish to print to"
 msgstr "列印時的紙張高度"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
+#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375
 msgid "Automatic Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
+#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392
 msgid "Number of Copies"
 msgstr "份數"
 
-#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
+#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr "請選擇列印多少份 (1-100 之間)"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
+#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436
 msgid "Image Position"
 msgstr "影像位置"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Auto"
 msgstr "自動"
 
-#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Portrait"
 msgstr "直向"
 
-#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Landscape"
 msgstr "橫向"
 
-#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
+#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459
 msgid "Upside down"
 msgstr "直向倒置"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid "Seascape"
 msgstr "橫向倒置"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr "指定列印時的方向：直向、橫向、直向倒置、橫向倒置"
 
-#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
+#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467
 msgid "Orientation:"
 msgstr "方向："
 
-#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Left:"
 msgstr "左："
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the image"
 msgstr "從紙張左邊邊緣至影像之間的距離"
 
-#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
-#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485
+#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486
 msgid "Right:"
 msgstr "右："
 
-#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "從紙張左邊邊緣至影像右邊邊緣之間的距離"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487
 msgid "Distance from the right of the paper to the image"
 msgstr "從紙張右邊邊緣至影像之間的距離"
 
-#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Top:"
 msgstr "上："
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to the image"
 msgstr "從紙張頂部邊緣至影像之間的距離"
 
-#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
-#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496
+#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497
 msgid "Bottom:"
 msgstr "下："
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "從紙張頂部邊緣至影像底部邊緣之間的距離"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
+#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498
 msgid "Distance from the bottom of the paper to the image"
 msgstr "從紙張底部邊緣至影像之間的距離"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center:"
 msgstr "置中："
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Horizontal"
 msgstr "水平"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512
 msgid "Center the image horizontally on the paper"
 msgstr "將影像的水平位置調整至紙張中間"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Both"
 msgstr "兩者"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515
 msgid "Center the image on the paper"
 msgstr "將影像放置在紙張中間"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Vertical"
 msgstr "垂直"
 
-#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518
 msgid "Center the image vertically on the paper"
 msgstr "將影像的垂直位置調整至紙張中間"
 
-#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
+#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531
 msgid "Setup Printer"
 msgstr "設定印表機"
 
-#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
+#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555
 msgid "Printer Make:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
+#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566
 msgid "Select the make of your printer"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672
+#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584
+#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890
 msgid "Printer Model:"
 msgstr "印表機型號："
 
-#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
+#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595
 msgid "Select your printer model"
 msgstr "請選取印表機型號"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
+#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643
 msgid "PPD File:"
 msgstr "PPD 檔："
 
-#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
+#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659
 msgid "Enter the correct PPD filename for your printer"
 msgstr "請輸入適合您的印表機使用的 PPD 檔案名稱"
 
-#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
-#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
+#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741
+#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
+#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668
 msgid "Choose the correct PPD filename for your printer"
 msgstr "請選擇適合您的印表機使用的 PPD 檔案名稱"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710
 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:1711 src/gutenprintui2/panel.c:1711
+#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712
 msgid "Printer Queue:"
 msgstr "印表機佇列："
 
-#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "Enter the correct command to print to your printer. "
 msgstr "請輸入列印所使用的指令。"
 
-#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
+#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739
 msgid "Enter the file to print to. "
 msgstr "請輸入列印時寫入的檔案。"
 
-#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
+#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747
 msgid "File to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755
 msgid "Print To File"
 msgstr "列印至檔案"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
+#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785
 msgid "Define New Printer"
 msgstr "定義新的印表機"
 
-#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
-#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887
+#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887
 msgid "Printer Name:"
 msgstr "印表機名稱："
 
-#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
+#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807
 msgid "Enter the name you wish to give this logical printer"
 msgstr "為這個虛擬印表機命名"
 
-#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
+#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817
 msgid "About Gutenprint "
 msgstr "關於 Gutenprint "
 
-#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
+#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824
 msgid "Gutenprint Version "
 msgstr "Gutenprint 版本 "
 
-#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872
 msgid "Printer Settings"
 msgstr "印表機設定"
 
-#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
 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:1901 src/gutenprintui2/panel.c:1901
+#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902
 msgid "Setup Printer..."
 msgstr "設定印表機..."
 
-#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
+#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr "選取列印時使用的印表機型號、PPD 檔及指令"
 
-#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid "New Printer..."
 msgstr "新增印表機..."
 
-#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
+#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918
 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:1960 src/gutenprintui2/panel.c:1960
+#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948
+msgid "Set Printer Option Defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972
 msgid "Image Size"
 msgstr "影像尺寸"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
+#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997
 msgid "Scaling:"
 msgstr "縮放："
 
-#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
 msgid "Set the scale (size) of the image"
 msgstr "指定影像的縮放比例 (尺寸)"
 
-#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr "指定放大縮小影像時的單位，是頁面尺寸的百分比，還是每英吋有多少點"
 
-#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031
 msgid "Percent"
 msgstr "百分比"
 
-#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036
 msgid "Scale the print to the size of the page"
 msgstr "指定列印時的影像尺寸為頁面尺寸的某個百分比"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
+#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045
 msgid "Scale the print to the number of dots per inch"
 msgstr "列印時，透過指定每英吋有多少點來放大縮小影像"
 
-#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063
 msgid "Set the width of the print"
 msgstr "指定列印時的影像寬度"
 
-#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the height of the print"
 msgstr "指定列印時的影像高度"
 
-#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6965,64 +7175,64 @@ msgstr ""
 "使用影像\n"
 "原來的尺寸"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
+#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077
 msgid "Set the print size to the size of the image"
 msgstr "將列印時的影像尺寸設定為影像原來的尺寸"
 
-#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
+#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101
 msgid "Print Color Adjust"
 msgstr "列印色彩調整"
 
-#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
+#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104
 msgid "Set Defaults"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
+#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106
 msgid "Close"
 msgstr "關閉"
 
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135
 msgid "Image preview"
 msgstr "影像預覽"
 
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
+#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240
 msgid "Output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
+#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268
 msgid "Output Type:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
 msgid "Select the desired output type"
 msgstr "指定輸出類型："
 
-#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
+#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293
 msgid "Adjust Output..."
 msgstr "調整輸出結果..."
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
+#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr "調整色彩平衡、光度、反差、彩度及擬色的運算方式"
 
-#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
+#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321
 msgid "Size Units:"
 msgstr "尺寸單位："
 
-#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324
 msgid " "
 msgstr ""
 
-#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
+#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348
 msgid "Units:"
 msgstr "單位："
 
-#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
+#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353
 msgid "Select the base unit of measurement for printing"
 msgstr "指定列印時的基本長度單位"
 
@@ -7055,11 +7265,11 @@ msgstr "Berkeley lpd (/usr/libexec/lpc)"
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
+#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057
 msgid "Printer"
 msgstr "印表機"
 
-#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
+#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250
 msgid "(Default Printer)"
 msgstr "(預設印表機)"
 
@@ -7107,85 +7317,85 @@ msgstr ""
 msgid "_Gamma value"
 msgstr "_Gamma 值"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:145
 msgid "Printer Features"
 msgstr "印表機功能"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:146
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:151
 msgid "Common"
 msgstr ""
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:152
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:154
+#: src/cups/genppd.c:153
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:155
+#: src/cups/genppd.c:154
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:156
+#: src/cups/genppd.c:155
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:157
+#: src/cups/genppd.c:156
 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:1055
+#: src/cups/genppd.c:1058
 msgid "English"
 msgstr "Chinese-TW"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1057
+#: src/cups/genppd.c:1060
 msgid "ISOLatin1"
 msgstr ""
 
-#: src/cups/genppd.c:1613
+#: src/cups/genppd.c:1641
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "雙面列印"
 
-#: src/cups/genppd.c:1634
+#: src/cups/genppd.c:1665
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1638
+#: src/cups/genppd.c:1669
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1639
+#: src/cups/genppd.c:1670
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1640
+#: src/cups/genppd.c:1671
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1717
+#: src/cups/genppd.c:1756
 msgid "No"
 msgstr "否"
 
-#: src/cups/genppd.c:1719
+#: src/cups/genppd.c:1758
 msgid "Yes"
 msgstr "是"
 
-#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#: src/cups/genppd.c:1795 src/cups/genppd.c:1857
 #, fuzzy
 msgid "Value"
 msgstr "藍"
 
-#: src/cups/genppd.c:1756
+#: src/cups/genppd.c:1800
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -7263,17 +7473,17 @@ msgid ""
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
 "                       rather than going through a printer queue.\n"
+"    -m|--model         Specify the printer model.\n"
 "    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
 "    -q|--quiet         Suppress the banner.\n"
 "    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:161
+#: src/escputil/escputil.c:162
 msgid ""
 "Usage: escputil [OPTIONS] [COMMAND]\n"
 "Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
@@ -7317,88 +7527,93 @@ msgid ""
 "    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:329 src/escputil/escputil.c:337
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
 #, c-format
 msgid "You may only specify one printer or raw device."
 msgstr ""
 
-#: src/escputil/escputil.c:345
+#: src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer model."
 msgstr ""
 
-#: src/escputil/escputil.c:369
+#: src/escputil/escputil.c:373
 #, c-format
 msgid "Alignment choices must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:376
+#: src/escputil/escputil.c:380
 #, c-format
 msgid "Alignment passes must be at least 1."
 msgstr ""
 
-#: src/escputil/escputil.c:381
+#: src/escputil/escputil.c:385
 #, c-format
 msgid "Unknown option %c\n"
 msgstr "選項 %c 不明\n"
 
-#: src/escputil/escputil.c:389
+#: src/escputil/escputil.c:393
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
 msgstr "用法：%s [選項] 指令\n"
 
-#: src/escputil/escputil.c:391
+#: src/escputil/escputil.c:395
 #, c-format
 msgid "Type `%s --help' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:393
+#: src/escputil/escputil.c:397
 #, c-format
 msgid "Type `%s -h' for more information.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:459
+#: src/escputil/escputil.c:463
 #, c-format
 msgid "Cannot open device %s: %s\n"
 msgstr "無法開啟裝置 %s：%s\n"
 
-#: src/escputil/escputil.c:482
+#: src/escputil/escputil.c:486
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:498 src/escputil/escputil.c:508
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
 #, c-format
 msgid "Unable to send command to printer\n"
 msgstr "無法將指令送出至印表機\n"
 
-#: src/escputil/escputil.c:568
+#: src/escputil/escputil.c:572
 #, c-format
 msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:573
+#: src/escputil/escputil.c:577
 #, c-format
 msgid "Cannot read from %s: %s\n"
 msgstr "無法由 %s 讀取資料：%s\n"
 
-#: src/escputil/escputil.c:747
+#: src/escputil/escputil.c:729
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:754
+#: src/escputil/escputil.c:736
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "不明選項 %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "無法寫入 %s：%s\n"
 
-#: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
-#: src/escputil/escputil.c:1511
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
+#: src/escputil/escputil.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -7407,7 +7622,7 @@ msgstr ""
 "\n"
 "無法寫入 %s：%s\n"
 
-#: src/escputil/escputil.c:885
+#: src/escputil/escputil.c:908
 #, c-format
 msgid ""
 "\n"
@@ -7415,214 +7630,212 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:983 src/escputil/escputil.c:989
-#: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
-#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1008
-#: src/escputil/escputil.c:1009 src/escputil/escputil.c:1010
-#: src/escputil/escputil.c:1013 src/escputil/escputil.c:1014
-#: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
-#: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
 msgid "Unknown"
 msgstr "不詳"
 
-#: src/escputil/escputil.c:1027
+#: src/escputil/escputil.c:1021
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:1024
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
+#: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
+#: src/escputil/escputil.c:1030
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "彩度"
 
-#: src/escputil/escputil.c:1039
+#: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
+#: src/escputil/escputil.c:1036
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
+#: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1054
+#: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1059
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
+#: src/escputil/escputil.c:1062
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1071
 #, c-format
 msgid "Error: Ink out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1074
 #, c-format
 msgid "Error: Paper out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1101
+#: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1104
+#: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1109
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
+#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
 #, c-format
 msgid "Ink Levels:\n"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
 msgid "Ink color"
 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
+#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Percent remaining"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
+#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
+#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
 #, c-format
 msgid "Warning: Black Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1309
+#: src/escputil/escputil.c:1305
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1318
+#: src/escputil/escputil.c:1314
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1347
+#: src/escputil/escputil.c:1343
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1350
+#: src/escputil/escputil.c:1346
 msgid "status"
 msgstr "狀態"
 
-#: src/escputil/escputil.c:1355
+#: src/escputil/escputil.c:1351
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1461
+#: src/escputil/escputil.c:1457
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
-#: src/escputil/escputil.c:1646
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
+#: src/escputil/escputil.c:1642
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
-#: src/escputil/escputil.c:1647
+#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
+#: src/escputil/escputil.c:1643
 msgid "Date"
 msgstr "日期"
 
-#: src/escputil/escputil.c:1675
+#: src/escputil/escputil.c:1671
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1693
+#: src/escputil/escputil.c:1689
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "無法識別印表機型號。\n"
 
-#: src/escputil/escputil.c:1713
+#: src/escputil/escputil.c:1711
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr ""
@@ -7712,7 +7925,7 @@ msgstr ""
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
 #, c-format
 msgid "Exiting\n"
 msgstr ""
@@ -7731,7 +7944,7 @@ msgstr ""
 
 #: 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
+#: src/escputil/escputil.c:1998
 msgid "> "
 msgstr "> "
 
@@ -7810,7 +8023,7 @@ msgstr ""
 #: src/escputil/escputil.c:1908
 #, c-format
 msgid ""
-"This procedure assumes that your printer is an Epson %s.\n"
+"This procedure assumes that your printer is an %s.\n"
 "If this is not your printer model, please type control-C now and\n"
 "choose your actual printer model.\n"
 "\n"
@@ -7818,12 +8031,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
-#: src/escputil/escputil.c:2047
+#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
+#: src/escputil/escputil.c:2051
 msgid "Press enter to continue > "
 msgstr "請按 enter 繼續 > "
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:1984
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -7831,42 +8044,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:1997
 #, c-format
 msgid "Pass #%d"
 msgstr "第 %d 次"
 
-#: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
+#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "請放入白紙。\n"
 
-#: src/escputil/escputil.c:2020
+#: src/escputil/escputil.c:2024
 #, c-format
 msgid "Number out of range!\n"
 msgstr "數字超出範圍以外！\n"
 
-#: src/escputil/escputil.c:2025
+#: src/escputil/escputil.c:2029
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2031
+#: src/escputil/escputil.c:2035
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2038
+#: src/escputil/escputil.c:2042
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:2041
+#: src/escputil/escputil.c:2045
 #, c-format
 msgid "succeeded.\n"
 msgstr "成功。\n"
 
-#: src/escputil/escputil.c:2042
+#: src/escputil/escputil.c:2046
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -7875,7 +8088,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:2092
 #, c-format
 msgid "Error in input\n"
 msgstr ""
@@ -8356,8 +8569,5 @@ msgstr ""
 #~ msgid "Print in black and white (no color, and no shades of gray)"
 #~ msgstr "以黑白模式列印 (沒有色彩，也不使用任何灰階)"
 
-#~ msgid "Unknown option %s\n"
-#~ msgstr "不明選項 %s\n"
-
 #~ msgid "%.0f of %.0f\n"
 #~ msgstr "%2$.0f 之 %1$.0f\n"
diff --git a/samples/Makefile.in b/samples/Makefile.in
index 6322433..82c90d7 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -19,15 +19,11 @@
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -72,51 +68,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -126,8 +84,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -208,14 +164,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -235,9 +188,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -256,27 +208,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -288,6 +239,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -333,8 +285,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 pkgsampledatadir = $(datadir)/$(PACKAGE)/samples
 @INSTALL_SAMPLES_TRUE@pkgsampledata_DATA = colorbars4.png colorsweep.png profile.jpg
@@ -378,13 +333,9 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-pkgsampledataDATA: $(pkgsampledata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgsampledatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgsampledatadir)"
+	test -z "$(pkgsampledatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsampledatadir)"
 	@list='$(pkgsampledata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -407,23 +358,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -439,7 +388,7 @@ check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(pkgsampledatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -472,7 +421,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -486,12 +435,20 @@ info-am:
 
 install-data-am: install-pkgsampledataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -510,18 +467,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pkgsampledataDATA
+uninstall-am: uninstall-pkgsampledataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man \
-	install-pkgsampledataDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-pkgsampledataDATA
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pkgsampledataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgsampledataDATA
 
 
 @SET_MAKE@
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 491a930..1eaa5ff 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -18,15 +18,11 @@
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -43,7 +39,7 @@ host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/scripts/global.mk compile config.guess \
 	config.rpath config.sub depcomp install-sh ltmain.sh missing \
-	mkinstalldirs
+	mkinstalldirs ylwrap
 subdir = scripts
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
@@ -64,51 +60,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -118,8 +76,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -200,14 +156,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -227,9 +180,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -248,27 +200,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -280,6 +231,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -325,8 +277,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 
 # The autotools-installed scripts /should/ be automatically distributed.
@@ -376,10 +331,6 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -388,23 +339,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -450,7 +399,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -464,12 +413,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -488,17 +445,20 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 
 @SET_MAKE@
diff --git a/scripts/config.guess b/scripts/config.guess
index 33c9ad7..ee5232a 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-05-13'
+timestamp='2006-07-02'
 
 # 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
@@ -221,7 +221,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -800,10 +800,10 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
+    x86:Interix*:[3456]*)
 	echo i586-pc-interix${UNAME_RELEASE}
 	exit ;;
-    EM64T:Interix*:[345]*)
+    EM64T:Interix*:[3456]*)
 	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -841,6 +841,9 @@ EOF
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
diff --git a/scripts/config.sub b/scripts/config.sub
index 4d936e2..fab0aa3 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-05-13'
+timestamp='2006-09-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -241,7 +241,7 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
@@ -276,6 +276,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| score \
 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@ case $basic_machine in
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -317,7 +318,7 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -367,7 +368,7 @@ case $basic_machine in
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
@@ -909,6 +910,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -1214,7 +1219,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1366,6 +1371,9 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
         spu-*)
 		os=-elf
 		;;
diff --git a/scripts/depcomp b/scripts/depcomp
index 04701da..ca5ea4e 100755
--- a/scripts/depcomp
+++ b/scripts/depcomp
@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-07-09.11
+scriptversion=2006-10-15.18
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 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
@@ -91,7 +92,20 @@ gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
   stat=$?
   if test $stat -eq 0; then :
   else
@@ -276,6 +290,46 @@ icc)
   rm -f "$tmpdepfile"
   ;;
 
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +342,13 @@ tru64)
 
    if test "$libtool" = yes; then
       # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # static library.  This mechanism is used in libtool 1.4 series to
       # handle both shared and static libraries in a single compilation.
       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
       #
       # With libtool 1.5 this exception was removed, and libtool now
       # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # compilations output dependencies in $dir.libs/$base.o.d and
       # in $dir$base.o.d.  We have to check for both files, because
       # one of the two compilations can be disabled.  We should prefer
       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
diff --git a/scripts/install-sh b/scripts/install-sh
index 4d4a951..4fbbae7 100755
--- a/scripts/install-sh
+++ b/scripts/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2006-10-14.15
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,15 +39,24 @@ scriptversion=2005-05-14.22
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
 
 mvprog="${MVPROG-mv}"
 cpprog="${CPPROG-cp}"
@@ -58,7 +67,13 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-chmodcmd="$chmodprog 0755"
+posix_glob=
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chmodcmd=$chmodprog
 chowncmd=
 chgrpcmd=
 stripcmd=
@@ -95,7 +110,7 @@ Environment variables override the default commands:
   CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
     -c) shift
         continue;;
@@ -111,9 +126,15 @@ while test -n "$1"; do
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
+    -m) mode=$2
         shift
         shift
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
         continue;;
 
     -o) chowncmd="$chownprog $2"
@@ -136,25 +157,33 @@ while test -n "$1"; do
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
+    --)	shift
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dstarg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dstarg"
+      shift # fnord
+    fi
+    shift # arg
+    dstarg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,6 +193,33 @@ if test -z "$1"; then
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
@@ -173,15 +229,11 @@ do
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -208,53 +260,188 @@ do
 	echo "$0: $dstarg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-  # Make sure that the destination directory exists.
-
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
-
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
 
-    pathcomp=
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
 
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix=/ ;;
+	-*) prefix=./ ;;
+	*)  prefix= ;;
+      esac
+
+      case $posix_glob in
+        '')
+	  if (set -f) 2>/dev/null; then
+	    posix_glob=true
+	  else
+	    posix_glob=false
+	  fi ;;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob && set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
+      $posix_glob && set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +449,9 @@ do
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -276,10 +462,10 @@ do
     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
       && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
 
     # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
       || {
 	   # The rename failed, perhaps because mv can't rename something else
 	   # to itself, or perhaps because mv is so ancient that it does not
@@ -291,11 +477,12 @@ do
 	   # reasons.  In this case, the final cleanup might fail but the new
 	   # file should still install successfully.
 	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	     if test -f "$dst"; then
+	       $doit $rmcmd -f "$dst" 2>/dev/null \
+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
 	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 echo "$0: cannot unlink or rename $dst" >&2
 		 (exit 1); exit 1
 	       }
 	     else
@@ -304,16 +491,13 @@ do
 	   } &&
 
 	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	   $doit $mvcmd "$dsttmp" "$dst"
 	 }
-    }
-  fi || { (exit 1); exit 1; }
-done
+    } || exit 1
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
+    trap '' 0
+  fi
+done
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/scripts/ltmain.sh b/scripts/ltmain.sh
index 06823e0..4598ec6 100644
--- a/scripts/ltmain.sh
+++ b/scripts/ltmain.sh
@@ -1,8 +1,8 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,14 +43,22 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+VERSION=1.5.24
+TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
+
+# Be Bourne compatible (taken from Autoconf:_AS_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
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
@@ -105,12 +113,14 @@ esac
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+	  save_$lt_var=\$$lt_var
+	  $lt_var=C
+	  export $lt_var
+	fi"
+done
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -136,6 +146,8 @@ duplicate_deps=no
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -196,7 +208,13 @@ func_win32_libid ()
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+	$SED -n -e '1,100{
+		/ I /{
+			s,.*,import,
+			p
+			q
+			}
+		}'`
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -327,7 +345,17 @@ func_extract_archives ()
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  extracted_serial=`expr $extracted_serial + 1`
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -454,11 +482,12 @@ do
     ;;
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2007  Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
     ;;
 
@@ -755,9 +784,10 @@ if test -z "$show_help"; then
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1168,9 @@ EOF
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1178,20 @@ EOF
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+	-static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1600,7 +1639,7 @@ EOF
 	continue
 	;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	compiler_flags="$compiler_flags $arg"
 	compile_command="$compile_command $arg"
 	finalize_command="$finalize_command $arg"
@@ -1620,10 +1659,11 @@ EOF
       # -m* pass through architecture-specific compiler args for GCC
       # -m*, -t[45]*, -txscale* pass through architecture-specific
       # compiler args for GCC
-      # -pg pass through profiling flag for GCC
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
       # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
@@ -1651,9 +1691,9 @@ EOF
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
+	  # and Darwin in order for the loader to find any dlls it needs.
 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
 	  fast_install=no
@@ -1712,7 +1752,7 @@ EOF
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2094,7 +2134,7 @@ EOF
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -2490,7 +2530,9 @@ EOF
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	     { { test "$prefer_static_libs" = no ||
+		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3186,7 +3228,7 @@ EOF
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3197,9 +3239,10 @@ EOF
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
@@ -3258,7 +3301,8 @@ EOF
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3272,8 +3316,11 @@ EOF
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -3410,11 +3457,11 @@ EOF
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+      #for path in $notinst_path; do
+      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3515,13 +3562,12 @@ EOF
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,9 +3606,7 @@ EOF
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3594,7 +3638,7 @@ EOF
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -3880,7 +3924,10 @@ EOF
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	      case $archive_cmds in
+	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+	      esac
 	    else
 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 	    fi
@@ -4239,12 +4286,14 @@ EOF
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4692,16 +4741,16 @@ static const void *lt_preloaded_setup() {
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4716,13 +4765,13 @@ static const void *lt_preloaded_setup() {
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4858,7 @@ static const void *lt_preloaded_setup() {
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4846,7 +4895,7 @@ static const void *lt_preloaded_setup() {
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5253,6 +5302,20 @@ EOF
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_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
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5458,7 @@ else
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5581,7 +5644,7 @@ fi\
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5926,9 +5989,9 @@ relink_command=\"$relink_command\""
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6200,7 @@ relink_command=\"$relink_command\""
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6348,8 +6411,10 @@ relink_command=\"$relink_command\""
 	if test -f "$dir/$objdir/$dlname"; then
 	  dir="$dir/$objdir"
 	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
+	  if test ! -f "$dir/$dlname"; then
+	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
 	fi
 	;;
 
@@ -6413,12 +6478,12 @@ relink_command=\"$relink_command\""
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+		$lt_var=\$save_$lt_var; export $lt_var
+	      fi"
+      done
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6775,9 +6840,9 @@ The following components of LINK-COMMAND are treated specially:
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6791,9 +6856,11 @@ The following components of LINK-COMMAND are treated specially:
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 
diff --git a/scripts/missing b/scripts/missing
index 894e786..1c8ff70 100755
--- a/scripts/missing
+++ b/scripts/missing
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
@@ -33,6 +33,8 @@ if test $# -eq 0; then
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +46,7 @@ fi
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +79,7 @@ Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@ esac
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
   lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
@@ -135,7 +138,7 @@ esac
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -164,7 +167,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -214,25 +217,25 @@ WARNING: \`$1' $msg.  You should only need it if
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
@@ -244,18 +247,18 @@ WARNING: \`$1' is $msg.  You should only need it if
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
@@ -267,11 +270,9 @@ WARNING: \`$1' is $msg.  You should only need it if
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
 	touch $file
     else
 	test -z "$file" || exec >$file
@@ -289,11 +290,17 @@ WARNING: \`$1' is $msg.  You should only need it if
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -317,13 +324,13 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
diff --git a/scripts/mkinstalldirs b/scripts/mkinstalldirs
index 259dbfc..ef7e16f 100755
--- a/scripts/mkinstalldirs
+++ b/scripts/mkinstalldirs
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2005-06-29.22
+scriptversion=2006-05-11.19
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -11,6 +11,9 @@ scriptversion=2005-06-29.22
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
+nl='
+'
+IFS=" ""	$nl"
 errstatus=0
 dirmode=
 
diff --git a/scripts/ylwrap b/scripts/ylwrap
new file mode 100755
index 0000000..102bd89
--- /dev/null
+++ b/scripts/ylwrap
@@ -0,0 +1,223 @@
+#! /bin/sh
+# ylwrap - wrapper for lex/yacc invocations.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
+#   Free Software Foundation, Inc.
+#
+# Written by Tom Tromey <tromey@cygnus.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 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., 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
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case "$1" in
+  '')
+    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
+    exit 1
+    ;;
+  --basedir)
+    basedir=$2
+    shift 2
+    ;;
+  -h|--h*)
+    cat <<\EOF
+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+
+Wrapper for lex/yacc invocations, renaming files as desired.
+
+  INPUT is the input file
+  OUTPUT is one file PROG generates
+  DESIRED is the file we actually want instead of OUTPUT
+  PROGRAM is program to run
+  ARGS are passed to PROG
+
+Any number of OUTPUT,DESIRED pairs may be used.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v|--v*)
+    echo "ylwrap $scriptversion"
+    exit $?
+    ;;
+esac
+
+
+# The input.
+input="$1"
+shift
+case "$input" in
+  [\\/]* | ?:[\\/]*)
+    # Absolute path; do nothing.
+    ;;
+  *)
+    # Relative path.  Make it absolute.
+    input="`pwd`/$input"
+    ;;
+esac
+
+pairlist=
+while test "$#" -ne 0; do
+  if test "$1" = "--"; then
+    shift
+    break
+  fi
+  pairlist="$pairlist $1"
+  shift
+done
+
+# The program to run.
+prog="$1"
+shift
+# Make any relative path in $prog absolute.
+case "$prog" in
+  [\\/]* | ?:[\\/]*) ;;
+  *[\\/]*) prog="`pwd`/$prog" ;;
+esac
+
+# FIXME: add hostname here for parallel makes that run commands on
+# other machines.  But that might take us over the 14-char limit.
+dirname=ylwrap$$
+trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+mkdir $dirname || exit 1
+
+cd $dirname
+
+case $# in
+  0) $prog "$input" ;;
+  *) $prog "$@" "$input" ;;
+esac
+ret=$?
+
+if test $ret -eq 0; then
+  set X $pairlist
+  shift
+  first=yes
+  # Since DOS filename conventions don't allow two dots,
+  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+  y_tab_nodot="no"
+  if test -f y_tab.c || test -f y_tab.h; then
+    y_tab_nodot="yes"
+  fi
+
+  # The directory holding the input.
+  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+  # Quote $INPUT_DIR so we can use it in a regexp.
+  # FIXME: really we should care about more than `.' and `\'.
+  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
+
+  while test "$#" -ne 0; do
+    from="$1"
+    # Handle y_tab.c and y_tab.h output by DOS
+    if test $y_tab_nodot = "yes"; then
+      if test $from = "y.tab.c"; then
+    	from="y_tab.c"
+      else
+    	if test $from = "y.tab.h"; then
+    	  from="y_tab.h"
+    	fi
+      fi
+    fi
+    if test -f "$from"; then
+      # If $2 is an absolute path name, then just use that,
+      # otherwise prepend `../'.
+      case "$2" in
+    	[\\/]* | ?:[\\/]*) target="$2";;
+    	*) target="../$2";;
+      esac
+
+      # We do not want to overwrite a header file if it hasn't
+      # changed.  This avoid useless recompilations.  However the
+      # parser itself (the first file) should always be updated,
+      # because it is the destination of the .y.c rule in the
+      # Makefile.  Divert the output of all other files to a temporary
+      # file so we can compare them to existing versions.
+      if test $first = no; then
+	realtarget="$target"
+	target="tmp-`echo $target | sed s/.*[\\/]//g`"
+      fi
+      # Edit out `#line' or `#' directives.
+      #
+      # We don't want the resulting debug information to point at
+      # an absolute srcdir; it is better for it to just mention the
+      # .y file with no path.
+      #
+      # We want to use the real output file name, not yy.lex.c for
+      # instance.
+      #
+      # We want the include guards to be adjusted too.
+      FROM=`echo "$from" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+      TARGET=`echo "$2" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+
+      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
+          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
+
+      # Check whether header files must be updated.
+      if test $first = no; then
+	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+	  echo "$2" is unchanged
+	  rm -f "$target"
+	else
+          echo updating "$2"
+          mv -f "$target" "$realtarget"
+        fi
+      fi
+    else
+      # A missing file is only an error for the first file.  This
+      # is a blatant hack to let us support using "yacc -d".  If -d
+      # is not specified, we don't want an error when the header
+      # file is "missing".
+      if test $first = yes; then
+        ret=1
+      fi
+    fi
+    shift
+    shift
+    first=no
+  done
+else
+  ret=$?
+fi
+
+# Remove the directory.
+cd ..
+rm -rf $dirname
+
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/src/Makefile.in b/src/Makefile.in
index ba6f519..1ce3791 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -18,15 +18,11 @@
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -61,61 +57,26 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -125,8 +86,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -207,14 +166,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -234,9 +190,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -255,27 +210,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -287,6 +241,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -332,8 +287,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 SUBDIRS = \
 	main					\
@@ -387,10 +345,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -422,8 +376,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -524,23 +477,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -554,7 +505,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -562,6 +513,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -602,8 +555,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -617,12 +569,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -641,22 +601,24 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 
 @SET_MAKE@
diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am
index 8b99888..04d870c 100644
--- a/src/cups/Makefile.am
+++ b/src/cups/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.87.8.2 2007/05/29 01:47:26 rlk Exp $
+## $Id: Makefile.am,v 1.87.8.3 2007/12/15 20:35:36 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -48,8 +48,6 @@ 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
-
 ## Programs
 
 if BUILD_TRANSLATED_CUPS_PPDS
@@ -72,6 +70,9 @@ sbin_PROGRAMS = cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION
 sbin_SCRIPTS = cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 cupsexec_backend_PROGRAMS = epson canon
 cupsexec_filter_PROGRAMS = rastertogutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ commandtoepson commandtocanon
+
+TESTS= test-ppds test-rastertogutenprint
+noinst_SCRIPTS=test-rastertogutenprint
 endif
 
 if BUILD_GENPPD_STATIC
diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in
index e1f7f29..dc0a6d7 100644
--- a/src/cups/Makefile.in
+++ b/src/cups/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -21,13 +21,9 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -43,6 +39,7 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/cups-genppdconfig.in $(srcdir)/cups-genppdupdate.in \
+	$(srcdir)/test-rastertogutenprint.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)
@@ -66,7 +63,8 @@ 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 = cups-genppdconfig cups-genppdupdate
+CONFIG_CLEAN_FILES = cups-genppdconfig cups-genppdupdate \
+	test-rastertogutenprint
 am__installdirs = "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(cupsexec_backenddir)" \
 	"$(DESTDIR)$(cupsexec_driverdir)" \
@@ -96,35 +94,53 @@ cups_calibrate_OBJECTS = $(am_cups_calibrate_OBJECTS)
 cups_calibrate_DEPENDENCIES =
 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 =  \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(GUTENPRINT_LIBS)
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK =  \
+	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) \
+	$(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) \
+	$(CFLAGS) \
+	$(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) \
+	$(LDFLAGS) -o $@
 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__DEPENDENCIES_1) $(GUTENPRINT_LIBS)
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK =  \
+	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) \
+	$(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) \
+	$(CFLAGS) \
+	$(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) \
+	$(LDFLAGS) -o $@
 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)
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+	$(am__DEPENDENCIES_1) $(GUTENPRINT_LIBS)
+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK =  \
+	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) \
+	$(LDFLAGS) -o $@
 sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(sbin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+SCRIPTS = $(noinst_SCRIPTS) $(sbin_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 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) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(canon_SOURCES) $(commandtocanon_SOURCES) \
 	$(commandtoepson_SOURCES) $(cups_calibrate_SOURCES) \
 	$(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) \
@@ -153,51 +169,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -207,8 +185,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -289,14 +265,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -316,9 +289,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -337,27 +309,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -369,6 +340,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -414,8 +386,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @cups_sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 empty = 
 pkgsysconfdir = $(cups_conf_serverroot)
@@ -427,12 +402,13 @@ cupsexec_filterdir = $(pkglibdir)/filter
 @CUPS_PPDS_AT_TOP_LEVEL_TRUE@DONT_UNINSTALL_PPDS = true
 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_CUPS_TRUE@TESTS = test-ppds test-rastertogutenprint
+@BUILD_CUPS_TRUE@noinst_SCRIPTS = test-rastertogutenprint
 @BUILD_GENPPD_STATIC_TRUE@STATIC_LDOPTS = -static -export-dynamic
 cups_calibrate_SOURCES = cups-calibrate.c
 cups_calibrate_LDADD = -lm
@@ -509,9 +485,11 @@ cups-genppdconfig: $(top_builddir)/config.status $(srcdir)/cups-genppdconfig.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 cups-genppdupdate: $(top_builddir)/config.status $(srcdir)/cups-genppdupdate.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+test-rastertogutenprint: $(top_builddir)/config.status $(srcdir)/test-rastertogutenprint.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -539,7 +517,7 @@ clean-binPROGRAMS:
 	done
 install-cupsexec_backendPROGRAMS: $(cupsexec_backend_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(cupsexec_backenddir)" || $(mkdir_p) "$(DESTDIR)$(cupsexec_backenddir)"
+	test -z "$(cupsexec_backenddir)" || $(MKDIR_P) "$(DESTDIR)$(cupsexec_backenddir)"
 	@list='$(cupsexec_backend_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -567,7 +545,7 @@ clean-cupsexec_backendPROGRAMS:
 	done
 install-cupsexec_driverPROGRAMS: $(cupsexec_driver_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(cupsexec_driverdir)" || $(mkdir_p) "$(DESTDIR)$(cupsexec_driverdir)"
+	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 \
@@ -595,7 +573,7 @@ clean-cupsexec_driverPROGRAMS:
 	done
 install-cupsexec_filterPROGRAMS: $(cupsexec_filter_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(cupsexec_filterdir)" || $(mkdir_p) "$(DESTDIR)$(cupsexec_filterdir)"
+	test -z "$(cupsexec_filterdir)" || $(MKDIR_P) "$(DESTDIR)$(cupsexec_filterdir)"
 	@list='$(cupsexec_filter_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -623,7 +601,7 @@ clean-cupsexec_filterPROGRAMS:
 	done
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -651,31 +629,31 @@ clean-sbinPROGRAMS:
 	done
 canon$(EXEEXT): $(canon_OBJECTS) $(canon_DEPENDENCIES) 
 	@rm -f canon$(EXEEXT)
-	$(LINK) $(canon_LDFLAGS) $(canon_OBJECTS) $(canon_LDADD) $(LIBS)
+	$(LINK) $(canon_OBJECTS) $(canon_LDADD) $(LIBS)
 commandtocanon$(EXEEXT): $(commandtocanon_OBJECTS) $(commandtocanon_DEPENDENCIES) 
 	@rm -f commandtocanon$(EXEEXT)
-	$(LINK) $(commandtocanon_LDFLAGS) $(commandtocanon_OBJECTS) $(commandtocanon_LDADD) $(LIBS)
+	$(LINK) $(commandtocanon_OBJECTS) $(commandtocanon_LDADD) $(LIBS)
 commandtoepson$(EXEEXT): $(commandtoepson_OBJECTS) $(commandtoepson_DEPENDENCIES) 
 	@rm -f commandtoepson$(EXEEXT)
-	$(LINK) $(commandtoepson_LDFLAGS) $(commandtoepson_OBJECTS) $(commandtoepson_LDADD) $(LIBS)
+	$(LINK) $(commandtoepson_OBJECTS) $(commandtoepson_LDADD) $(LIBS)
 cups-calibrate$(EXEEXT): $(cups_calibrate_OBJECTS) $(cups_calibrate_DEPENDENCIES) 
 	@rm -f cups-calibrate$(EXEEXT)
-	$(LINK) $(cups_calibrate_LDFLAGS) $(cups_calibrate_OBJECTS) $(cups_calibrate_LDADD) $(LIBS)
+	$(LINK) $(cups_calibrate_OBJECTS) $(cups_calibrate_LDADD) $(LIBS)
 cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT): $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES) 
 	@rm -f cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT)
-	$(LINK) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD) $(LIBS)
+	$(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD) $(LIBS)
 epson$(EXEEXT): $(epson_OBJECTS) $(epson_DEPENDENCIES) 
 	@rm -f epson$(EXEEXT)
-	$(LINK) $(epson_LDFLAGS) $(epson_OBJECTS) $(epson_LDADD) $(LIBS)
+	$(LINK) $(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)
+	$(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK) $(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)
+	$(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK) $(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD) $(LIBS)
 install-sbinSCRIPTS: $(sbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
@@ -709,50 +687,50 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rastertoprinter.Po@am__quote@
 
 .c.o:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @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
+@am__fastdepCC_TRUE@	$(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@	mv -f $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po
 @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
+@am__fastdepCC_TRUE@	$(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@	mv -f $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po
 @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
+@am__fastdepCC_TRUE@	$(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@	mv -f $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po
 @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
+@am__fastdepCC_TRUE@	$(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@	mv -f $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po
 @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`
@@ -762,13 +740,9 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(pkgdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -785,7 +759,7 @@ uninstall-pkgdataDATA:
 	done
 install-pkgsysconfDATA: $(pkgsysconf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgsysconfdir)" || $(mkdir_p) "$(DESTDIR)$(pkgsysconfdir)"
+	test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)"
 	@list='$(pkgsysconf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -850,9 +824,9 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -861,7 +835,7 @@ check-TESTS: $(TESTS)
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -873,7 +847,7 @@ check-TESTS: $(TESTS)
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -923,23 +897,21 @@ check-TESTS: $(TESTS)
 	else :; fi
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -959,7 +931,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) all-local
 installdirs:
 	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"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -999,7 +971,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -1016,15 +988,23 @@ install-data-am: install-data-local install-pkgdataDATA \
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS install-cupsexec_backendPROGRAMS \
 	install-cupsexec_driverPROGRAMS \
 	install-cupsexec_filterPROGRAMS install-sbinPROGRAMS \
 	install-sbinSCRIPTS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1047,10 +1027,12 @@ 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-cupsexec_filterPROGRAMS uninstall-local \
+	uninstall-pkgdataDATA uninstall-pkgsysconfDATA \
 	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
 
+.MAKE: install-am install-data-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
 	clean clean-binPROGRAMS clean-cupsexec_backendPROGRAMS \
 	clean-cupsexec_driverPROGRAMS clean-cupsexec_filterPROGRAMS \
@@ -1061,9 +1043,11 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsexec_backendPROGRAMS \
 	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 \
-	install-pkgdataDATA install-pkgsysconfDATA \
+	install-data-hook install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgdataDATA \
+	install-pkgsysconfDATA install-ps install-ps-am \
 	install-sbinPROGRAMS install-sbinSCRIPTS install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
@@ -1071,8 +1055,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsexec_backendPROGRAMS \
 	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-cupsexec_filterPROGRAMS uninstall-local \
+	uninstall-pkgdataDATA uninstall-pkgsysconfDATA \
 	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
 
 
diff --git a/src/cups/command.types b/src/cups/command.types
index 5b33d45..de77a08 100644
--- a/src/cups/command.types
+++ b/src/cups/command.types
@@ -1,36 +1,28 @@
 #
-# "$Id: command.types,v 1.1 2001/01/22 20:22:54 rleigh Exp $"
+# "$Id: command.types,v 1.1.78.1 2007/12/23 17:30:03 easysw Exp $"
 #
 #   MIME types file for the CUPS drivers.
 #
 #   Copyright 1993-2000 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,
-#   version 2, as published by the Free Software Foundation.
+#   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.
+#   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, please contact Easy Software
-#   Products at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
 # Define the new application/vnd.cups-command filetype...
 application/vnd.cups-command	string(0,'#CUPS-COMMAND')
 
 #
-# End of "$Id: command.types,v 1.1 2001/01/22 20:22:54 rleigh Exp $".
+# End of "$Id: command.types,v 1.1.78.1 2007/12/23 17:30:03 easysw Exp $".
 #
diff --git a/src/cups/commandtoepson.c b/src/cups/commandtoepson.c
index c63f51d..1d0a4e3 100644
--- a/src/cups/commandtoepson.c
+++ b/src/cups/commandtoepson.c
@@ -1,31 +1,23 @@
 /*
- * "$Id: commandtoepson.c,v 1.2 2001/06/03 20:53:24 rlk Exp $"
+ * "$Id: commandtoepson.c,v 1.2.68.1 2007/12/23 17:30:04 easysw Exp $"
  *
  *   EPSON ESC/P2 command filter for the Common UNIX Printing System.
  *
  *   Copyright 1993-2000 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,
- *   version 2, as published by the Free Software Foundation.
+ *   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.
+ *   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, please contact Easy Software
- *   Products at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * Contents:
  *
@@ -237,5 +229,5 @@ main(int  argc,		/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: commandtoepson.c,v 1.2 2001/06/03 20:53:24 rlk Exp $".
+ * End of "$Id: commandtoepson.c,v 1.2.68.1 2007/12/23 17:30:04 easysw Exp $".
  */
diff --git a/src/cups/cups-calibrate.c b/src/cups/cups-calibrate.c
index 20e8f49..50c4eb7 100644
--- a/src/cups/cups-calibrate.c
+++ b/src/cups/cups-calibrate.c
@@ -1,32 +1,24 @@
 /*
- * "$Id: cups-calibrate.c,v 1.5 2004/09/17 18:38:10 rleigh Exp $"
+ * "$Id: cups-calibrate.c,v 1.5.18.1 2007/12/23 17:30:04 easysw Exp $"
  *
  *   Super simple color calibration program for the Common UNIX
  *   Printing System.
  *
  *   Copyright 1993-2000 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,
- *   version 2, as published by the Free Software Foundation.
+ *   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.
+ *   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, please contact Easy Software
- *   Products at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * Contents:
  *
diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in
index ee49a0b..119c350 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.8.2 2007/05/29 01:47:26 rlk Exp $
+# $Id: cups-genppdupdate.in,v 1.25.8.4 2007/12/29 20:42:25 rlk Exp $
 # Update CUPS PPDs for Gutenprint queues.
 # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org)
 #
@@ -37,6 +37,8 @@ our $opt_h; # Help
 our $opt_n; # No action
 our $opt_q; # Quiet mode
 our $opt_s; # Source PPD location
+our $opt_p; # New PPD location
+our $opt_P; # PPD generator location
 our $opt_v; # Verbose mode
 our $opt_N; # Don't update PPD file options
 our $opt_o; # Output directory
@@ -62,6 +64,11 @@ my $updated_ppd_count = 0;
 my $exit_after_parse_args = 0;
 
 my $serverdir = "@cups_conf_serverbin@";
+my $driver_bin = "$serverdir/driver/gutenprint.$version";
+my $driver_version = `$driver_bin VERSION`;
+chomp $driver_version;
+
+$Getopt::Std::STANDARD_HELP_VERSION = 1;
 
 $Getopt::Std::STANDARD_HELP_VERSION = 1;
 
@@ -192,6 +199,8 @@ sub HELP_MESSAGE($;$$$) {
     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 "  -p ppd_dir  Update PPD files in ppd_dir.\n";
+    print $fh "  -P driver   Use the specified driver binary to generate PPD files.\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";
@@ -213,7 +222,7 @@ sub help() {
 }
 
 sub parse_options () {
-    if (!getopts('d:hnqs:vNo:')) {
+    if (!getopts('d:hnqs:vNo:p:P:')) {
 	help();
     }
     if ($opt_n) {
@@ -230,6 +239,22 @@ sub parse_options () {
 	    die "$opt_s: invalid directory: $!\n";
 	}
     }
+    if ($opt_p) {
+	if (-d $opt_p) {
+	    $ppd_dir = "$opt_p";
+	}
+	else {
+	    die "$opt_p: invalid directory: $!\n";
+	}
+    }
+    if ($opt_P) {
+	if (-x $opt_P) {
+	    $driver_bin = "$opt_P";
+	}
+	else {
+	    die "$opt_P: invalid executable: $!\n";
+	}
+    }
     if ($opt_v) {
 	$verbose = 1;
 	$quiet = 0;
@@ -246,7 +271,7 @@ sub parse_options () {
 	    $ppd_out_dir = "$opt_o";
 	}
 	else {
-	    die "$opt_s: invalid directory: $!\n";
+	    die "$opt_o: invalid directory: $!\n";
 	}
     }
     if ($opt_h) {
@@ -263,30 +288,34 @@ sub get_ppd_contents($$$$$) {
     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";
+    if ($use_static_ppd eq "no" && $driver_version eq "@VERSION@") {
+	my ($simplified);
+	if ($filename =~ m,.*/([^/]*)(.sim)(.ppd)?(.gz)?$,) {
+	    $simplified = "simple";
+	} else {
+	    $simplified = "expert";
+	}
+	my ($url);
+	my (@url_list);
+	if ($locale) {
+	    if ($region) {
+		push @url_list, "gutenprint.$version://$driver/$simplified/${locale}_${region}";
 	    }
-	    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 );
-		    }
+	    push @url_list, "gutenprint.$version://$driver/$simplified/${locale}";
+	}
+	push @url_list, "gutenprint.$version://$driver/$simplified";
+	foreach $url (@url_list) {
+	    $new_ppd_filename = $url;
+	    if ($debug & 8) {
+		print "Trying $driver_bin cat $url for $driver, $simplified, $locale, $region\n";
+	    }
+	    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 );
 		}
 	    }
 	}
@@ -372,7 +401,7 @@ sub update_ppd ($) {
 	}
     }
     if (! $valid) {
-	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";
+	print STDERR "$ppd_source_filename: this PPD file cannot be upgraded automatically (only files based on Gutenprint 5.0.0 and newer can be)\n";
 	return 0;
     }
     if ($debug & 2) {
@@ -408,7 +437,8 @@ sub update_ppd ($) {
 			 $driver, $locale, $region);
 
     if (! $source_data) {
-	die "Unable to retrieve PPD file!\n";
+	print "Unable to retrieve PPD file!\n";
+	return 0;
     }
 
     # Save new PPD in a temporary file, for processing...
@@ -426,12 +456,19 @@ sub update_ppd ($) {
     my %new_default_types = get_default_types($tmpfile);
     my %defaults = get_defaults(ORIG);
     my %options = get_options($tmpfile, %new_default_types);
+    my %resolution_map = get_resolution_map($tmpfile);
 
 
     # Close original and temporary files...
 
-    close ORIG or die "$_: can't close file: $!";
-    close $tmpfile or die "can't close temporary file $tmpfile: $!";
+    if (! close ORIG) {
+	print "$_: can't close file: $!\n";
+	return 0;
+    }
+    if (! close $tmpfile) {
+	print "can't close temporary file $tmpfile: $!\n";
+	return 0;
+    }
 
 
     if ($debug & 4) {
@@ -456,6 +493,12 @@ sub update_ppd ($) {
 	    }
 	    print "\n";
 	}
+	if (keys %resolution_map) {
+	    print "Resolution Map:\n";
+	    foreach (sort keys %resolution_map) {
+		print "$_: $resolution_map{$_}\n";
+	    }
+	}
 	print "Non-UI Defaults:\n";
 	foreach (sort keys %defaults) {
 	    my ($xkey) = $_;
@@ -488,10 +531,9 @@ sub update_ppd ($) {
 
 	# Loop through each default in turn.
 default_loop:
-	foreach (sort keys %defaults) {
-	    my $default_option = $_;
+	foreach my $default_option (sort keys %defaults) {
 	    my $option;
-	    ($option = $_) =~ s/Default//; # Strip off `Default'
+	    ($option = $default_option) =~ s/Default//; # Strip off `Default'
 	    # Check method is valid
 	    my $orig_method = $orig_default_types{$option};
 	    my $new_method = $new_default_types{$option};
@@ -501,12 +543,16 @@ default_loop:
 	    }
 	    if ($new_method eq "PickOne") {
 		# Check the old setting is valid
-		foreach (@{$options{$option}}) {
-		    if ($defaults{$default_option} eq $_) { # Valid option
+		foreach my $opt (@{$options{$option}}) {
+		    my $def_option = $defaults{$default_option};
+		    if (($def_option eq $opt) ||
+			($option eq "Resolution" &&
+			 (defined $resolution_map{$defaults{$default_option}}) &&
+			 ($def_option = $resolution_map{$defaults{$default_option}}) eq $opt)) { # Valid option
 			# Set the option in the new PPD
-			$source_data =~ s/\*($default_option).*/*$1:$defaults{$default_option}/m;
+			$source_data =~ s/\*($default_option).*/*$1:$def_option/m;
 			if ($verbose) {
-			    print "$ppd_source_filename: Set *$default_option to $defaults{$default_option}\n";
+			    print "$ppd_source_filename: Set *$default_option to $def_option\n";
 			}
 			next default_loop;
 		    }
@@ -514,7 +560,7 @@ default_loop:
 		warn "Warning: $ppd_source_filename: Invalid option: *$default_option: $defaults{$default_option}.  Using default setting.\n";
 		next;
 	    }
-	    warn "Warning: $ppd_source_filename: PPD OpenUI method $new_default_types{$_} not understood.\n";
+	    warn "Warning: $ppd_source_filename: PPD OpenUI method $new_default_types{$default_option} not understood.\n";
 	}
     }
 
@@ -658,6 +704,25 @@ sub get_default_types(*) {
 
 
 # Return the default options from the given PPD filename
+sub get_resolution_map(*) {
+    my $fh = $_[0];
+    my %resolution_map;
+
+    # Read each line of the original PPD file, and store all OpenUI
+    # names and their types in a hash...
+    seek ($fh, 0, 0) or die "can't seek to start of PPD file";
+    while (<$fh>) {
+	if ( m/^\*StpResolutionMap:/ ) {
+	    chomp;
+	    my ($junk, $new, $old) = split;
+	    $resolution_map{$old} = $new;
+	}
+    }
+    return %resolution_map;
+}
+
+
+# Return the default options from the given PPD filename
 sub get_defaults(*) {
     my $fh = $_[0];
     my %defaults;
diff --git a/src/cups/epson.c b/src/cups/epson.c
index e1e14c4..f3e326c 100644
--- a/src/cups/epson.c
+++ b/src/cups/epson.c
@@ -1,31 +1,23 @@
 /*
- * "$Id: epson.c,v 1.7.8.1 2007/05/12 19:32:08 faust3 Exp $"
+ * "$Id: epson.c,v 1.7.8.2 2007/12/23 17:30:04 easysw Exp $"
  *
  *   EPSON backend for the Common UNIX Printing System.
  *
  *   Copyright 1993-2000 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,
- *   version 2, as published by the Free Software Foundation.
+ *   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.
+ *   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, please contact Easy Software
- *   Products at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * Contents:
  *
@@ -883,5 +875,5 @@ list_devices(void)
 
 
 /*
- * End of "$Id: epson.c,v 1.7.8.1 2007/05/12 19:32:08 faust3 Exp $".
+ * End of "$Id: epson.c,v 1.7.8.2 2007/12/23 17:30:04 easysw Exp $".
  */
diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index 4b49ba6..3ba6953 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -1,31 +1,23 @@
 /*
- * "$Id: genppd.c,v 1.119.2.3 2007/05/29 01:47:26 rlk Exp $"
+ * "$Id: genppd.c,v 1.119.2.5 2007/12/23 17:30:05 easysw Exp $"
  *
  *   PPD file generation program for the CUPS drivers.
  *
  *   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,
- *   version 2, as published by the Free Software Foundation.
+ *   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.
+ *   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, please contact Easy Software
- *   Products at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * Contents:
  *
@@ -96,11 +88,18 @@ static const char *gzext = "";
  * 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.
+ *
+ * As of Gutenprint 5.0.2 and 5.1.4, *always* use the compliant names.
+ * OS X Leopard seems to be very unhappy if there are invalid resolution
+ * names.  We've added a mapping between the invalid names and the
+ * valid names so that genppdupdate knows how to translate the names.
  */
 
+#if 0
 #if defined(CUPS_DRIVER_INTERFACE) || (STP_MAJOR_VERSION > 5) || (STP_MAJOR_VERSION == 5 && STP_MINOR_VERSION > 0)
 #define USE_COMPLIANT_RESOLUTIONS 1
 #endif
+#endif
 
 /*
  * Note:
@@ -996,6 +995,8 @@ write_ppd(
 		bottom, left,
 		top, right;
   const char	*driver;		/* Driver name */
+  const char	*family;		/* Printer family */
+  int		model;			/* Internal model ID */
   const char	*long_name;		/* Driver long name */
   const char	*manufacturer;		/* Manufacturer of printer */
   const stp_vars_t *printvars;		/* Printer option names */
@@ -1020,6 +1021,8 @@ write_ppd(
   */
 
   driver     = stp_printer_get_driver(p);
+  family     = stp_printer_get_family(p);
+  model      = stp_printer_get_model(p);
   long_name  = stp_printer_get_long_name(p);
   manufacturer = stp_printer_get_manufacturer(p);
   printvars  = stp_printer_get_defaults(p);
@@ -1154,6 +1157,7 @@ write_ppd(
     gzputs(fp, "*cupsFilter:	\"application/vnd.cups-command 33 commandtoepson\"\n");
   gzputs(fp, "\n");
   gzprintf(fp, "*StpDriverName:	\"%s\"\n", driver);
+  gzprintf(fp, "*StpDriverModelFamily:	\"%d_%s\"\n", model, family);
   gzprintf(fp, "*StpPPDLocation: \"%s\"\n", ppd_location);
   gzprintf(fp, "*StpLocale:	\"%s\"\n", language ? language : "C");
 
@@ -1235,6 +1239,9 @@ write_ppd(
 
   gzputs(fp, "*OpenUI *PageSize: PickOne\n");
   gzputs(fp, "*OrderDependency: 10 AnySetup *PageSize\n");
+  gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+	   desc.name, desc.p_type, desc.is_mandatory,
+	   desc.p_class, desc.p_level, desc.channel, 0.0, 0.0, 0.0);
   gzprintf(fp, "*DefaultPageSize: %s\n", desc.deflt.str);
   gzprintf(fp, "*StpDefaultPageSize: %s\n", desc.deflt.str);
   for (i = 0; i < cur_opt; i ++)
@@ -1409,6 +1416,9 @@ write_ppd(
   {
     gzprintf(fp, "*OpenUI *MediaType/%s: PickOne\n", _("Media Type"));
     gzputs(fp, "*OrderDependency: 10 AnySetup *MediaType\n");
+    gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+	     desc.name, desc.p_type, desc.is_mandatory,
+	     desc.p_class, desc.p_level, desc.channel, 0.0, 0.0, 0.0);
     gzprintf(fp, "*DefaultMediaType: %s\n", desc.deflt.str);
     gzprintf(fp, "*StpDefaultMediaType: %s\n", desc.deflt.str);
 
@@ -1434,6 +1444,9 @@ write_ppd(
   {
     gzprintf(fp, "*OpenUI *InputSlot/%s: PickOne\n", _("Media Source"));
     gzputs(fp, "*OrderDependency: 10 AnySetup *InputSlot\n");
+    gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+	     desc.name, desc.p_type, desc.is_mandatory,
+	     desc.p_class, desc.p_level, desc.channel, 0.0, 0.0, 0.0);
     gzprintf(fp, "*DefaultInputSlot: %s\n", desc.deflt.str);
     gzprintf(fp, "*StpDefaultInputSlot: %s\n", desc.deflt.str);
 
@@ -1459,6 +1472,9 @@ write_ppd(
       has_quality_parameter = 1;
       gzprintf(fp, "*OpenUI *StpQuality/%s: PickOne\n", gettext(desc.text));
       gzputs(fp, "*OrderDependency: 10 AnySetup *StpQuality\n");
+      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+	       desc.name, desc.p_type, desc.is_mandatory,
+	       desc.p_type, desc.p_level, desc.channel, 0.0, 0.0, 0.0);
       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);
@@ -1494,23 +1510,46 @@ write_ppd(
 
   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: 10 AnySetup *Resolution\n");
+      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+	       desc.name, desc.p_type, desc.is_mandatory,
+	       desc.p_class, desc.p_level, desc.channel, 0.0, 0.0, 0.0);
       if (has_quality_parameter)
 	{
-	  gzprintf(fp, "*DefaultResolution: None\n");
-	  gzprintf(fp, "*StpDefaultResolution: None\n");
+	  stp_parameter_t desc1;
+	  stp_clear_string_parameter(v, "Resolution");
+	  stp_describe_parameter(v, "Quality", &desc1);
+	  stp_set_string_parameter(v, "Quality", desc1.deflt.str);
+	  stp_describe_resolution(v, &xdpi, &ydpi);
+	  stp_clear_string_parameter(v, "Quality");
+	  tmp_xdpi = xdpi;
+	  tmp_ydpi = ydpi;
+	  if (tmp_ydpi > tmp_xdpi)
+	    tmp_ydpi = tmp_xdpi;
+	  else
+	    tmp_xdpi = tmp_ydpi;
+	  /*
+	     Make the default resolution look like an almost square resolution
+	     so that applications using it will be less likely to generate
+	     excess resolution.  However, make the hardware resolution
+	     match the printer default.
+	  */
+	  (void) snprintf(res_name, 63, "%dx%ddpi", tmp_xdpi, tmp_xdpi + 1);
+	  stp_string_list_add_string(res_list, res_name, res_name);
+	  gzprintf(fp, "*DefaultResolution: %s\n", res_name);
+	  gzprintf(fp, "*StpDefaultResolution: %s\n", res_name);
+	  gzprintf(fp, "*Resolution %s/Automatic:\t\"<</HWResolution[%d %d]>>setpagedevice\"\n",
+		   res_name, xdpi, ydpi);
+	  gzprintf(fp, "*StpResolutionMap: %s %s\n", res_name, "None");
 	}
       else
       {
-#ifdef USE_COMPLIANT_RESOLUTIONS
 	stp_set_string_parameter(v, "Resolution", desc.deflt.str);
 	stp_describe_resolution(v, &xdpi, &ydpi);
 
@@ -1526,15 +1565,9 @@ write_ppd(
 	 * 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)
-	gzprintf(fp, "*Resolution None/%s: \"\"\n", _("Automatic"));
       for (i = 0; i < num_opts; i ++)
 	{
 	  /*
@@ -1548,7 +1581,6 @@ write_ppd(
 	  if (xdpi == -1 || ydpi == -1)
 	    continue;
 
-#ifdef USE_COMPLIANT_RESOLUTIONS
 	  resolution_ok = 0;
 	  tmp_xdpi = xdpi;
 	  tmp_ydpi = ydpi;
@@ -1571,15 +1603,11 @@ write_ppd(
 	    } 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 */
+	  if (strcmp(res_name, opt->name) != 0)
+	    gzprintf(fp, "*StpResolutionMap: %s %s\n", res_name, opt->name);
 	}
 
-#ifdef USE_COMPLIANT_RESOLUTIONS
       stp_string_list_destroy(res_list);
-#endif
       gzputs(fp, "*CloseUI: *Resolution\n\n");
     }
 
@@ -1612,6 +1640,9 @@ write_ppd(
       {
         gzprintf(fp, "*OpenUI *Duplex/%s: PickOne\n", _("2-Sided Printing"));
         gzputs(fp, "*OrderDependency: 10 AnySetup *Duplex\n");
+	gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+		 desc.name, desc.p_type, desc.is_mandatory,
+		 desc.p_class, desc.p_level, desc.channel, 0.0, 0.0, 0.0);
         gzprintf(fp, "*DefaultDuplex: %s\n", desc.deflt.str);
         gzprintf(fp, "*StpDefaultDuplex: %s\n", desc.deflt.str);
 
@@ -1676,6 +1707,10 @@ write_ppd(
 		  switch (desc.p_type)
 		    {
 		    case STP_PARAMETER_TYPE_STRING_LIST:
+		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+			       desc.name, desc.p_type, desc.is_mandatory,
+			       desc.p_class, desc.p_level, desc.channel,
+			       0.0, 0.0, 0.0);
 		      if (desc.is_mandatory)
 			{
 			  gzprintf(fp, "*DefaultStp%s: %s\n",
@@ -1699,6 +1734,10 @@ write_ppd(
 			}
 		      break;
 		    case STP_PARAMETER_TYPE_BOOLEAN:
+		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+			       desc.name, desc.p_type, desc.is_mandatory,
+			       desc.p_class, desc.p_level, desc.channel,
+			       0.0, 0.0, desc.deflt.boolean ? 1.0 : 0.0);
 		      if (desc.is_mandatory)
 			{
 			  gzprintf(fp, "*DefaultStp%s: %s\n", desc.name,
@@ -1719,6 +1758,11 @@ write_ppd(
 			       desc.name, "True", _("Yes"));
 		      break;
 		    case STP_PARAMETER_TYPE_DOUBLE:
+		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+			       desc.name, desc.p_type, desc.is_mandatory,
+			       desc.p_class, desc.p_level, desc.channel,
+			       desc.bounds.dbl.lower, desc.bounds.dbl.upper,
+			       desc.deflt.dbl);
 		      gzprintf(fp, "*DefaultStp%s: None\n", desc.name);
 		      gzprintf(fp, "*StpDefaultStp%s: None\n", desc.name);
 		      for (i = desc.bounds.dbl.lower * 1000;
@@ -1754,6 +1798,9 @@ write_ppd(
 			{
 			  gzprintf(fp, "*OpenUI *StpFine%s/%s %s: PickOne\n",
 				   desc.name, gettext(desc.text), _("Fine Adjustment"));
+			  gzprintf(fp, "*StpStpFine%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+				   desc.name, STP_PARAMETER_TYPE_INVALID, 0,
+				   0, 0, -1, 0.0, 0.0, 0.0);
 			  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);
@@ -1766,6 +1813,12 @@ write_ppd(
 
 		      break;
 		    case STP_PARAMETER_TYPE_DIMENSION:
+		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+			       desc.name, desc.p_type, desc.is_mandatory,
+			       desc.p_class, desc.p_level, desc.channel,
+			       (double) desc.bounds.dimension.lower,
+			       (double) desc.bounds.dimension.upper,
+			       (double) desc.deflt.dimension);
 		      if (desc.is_mandatory)
 			{
 			  gzprintf(fp, "*DefaultStp%s: %d\n",
@@ -1871,5 +1924,5 @@ write_ppd(
 
 
 /*
- * End of "$Id: genppd.c,v 1.119.2.3 2007/05/29 01:47:26 rlk Exp $".
+ * End of "$Id: genppd.c,v 1.119.2.5 2007/12/23 17:30:05 easysw Exp $".
  */
diff --git a/src/cups/rastertoprinter.c b/src/cups/rastertoprinter.c
index 52d3592..2f636ea 100644
--- a/src/cups/rastertoprinter.c
+++ b/src/cups/rastertoprinter.c
@@ -1,31 +1,23 @@
 /*
- * "$Id: rastertoprinter.c,v 1.105.2.1 2007/03/02 12:01:16 rlk Exp $"
+ * "$Id: rastertoprinter.c,v 1.105.2.6 2008/01/02 01:38:09 rlk Exp $"
  *
  *   Gutenprint based raster filter for the Common UNIX Printing System.
  *
  *   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,
- *   version 2, as published by the Free Software Foundation.
+ *   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.
+ *   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, please contact Easy Software
- *   Products at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * Contents:
  *
@@ -120,11 +112,13 @@ static stp_image_t theImage =
 static volatile stp_image_status_t Image_status = STP_IMAGE_STATUS_OK;
 static double total_bytes_printed = 0;
 static int print_messages_as_errors = 0;
+static int suppress_messages = 0;
 
 static void
 set_string_parameter(stp_vars_t *v, const char *name, const char *val)
 {
-  fprintf(stderr, "DEBUG: Gutenprint set string %s to %s\n", name, val);
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint   set special string %s to %s\n", name, val);
   stp_set_string_parameter(v, name, val);
 }
   
@@ -139,23 +133,32 @@ set_special_parameter(stp_vars_t *v, const char *name, int choice)
       if (choice < 0)
 	{
 	  stp_clear_string_parameter(v, name);
-	  fprintf(stderr, "DEBUG: Gutenprint clear special parameter %s\n",
-		  name);
+	  if (! suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint   clear special parameter %s\n",
+		    name);
 	}
       else if (choice >= stp_string_list_count(desc.bounds.str))
-	fprintf(stderr, "ERROR: Gutenprint unable to set %s!\n", name);
+	{
+	  if (! suppress_messages)
+	    fprintf(stderr, "ERROR: Gutenprint   UNABLE to set %s (%d > %d)!\n",
+		    name, choice, stp_string_list_count(desc.bounds.str));
+	}
       else
 	{
 	  stp_set_string_parameter
 	    (v, name, stp_string_list_param(desc.bounds.str, choice)->name);
-	  fprintf(stderr, "DEBUG: Gutenprint set special parameter %s to choice %d (%s)\n",
-		  name, choice,
-		  stp_string_list_param(desc.bounds.str, choice)->name);
+	  if (! suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint   set special parameter %s to choice %d (%s)\n",
+		    name, choice,
+		    stp_string_list_param(desc.bounds.str, choice)->name);
 	}
     }
   else
-    fprintf(stderr, "DEBUG: Gutenprint unable to set special %s: not a string\n",
-	    name);
+    {
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint   UNABLE to set special %s: not a string\n",
+		name);
+    }
   stp_parameter_description_destroy(&desc);
 }
 
@@ -165,62 +168,62 @@ print_debug_block(const stp_vars_t *v, const cups_image_t *cups)
   stp_parameter_list_t params;
   int nparams;
   int i;
-  fprintf(stderr, "DEBUG: Gutenprint StartPage...\n");
-  fprintf(stderr, "DEBUG: Gutenprint MediaClass = \"%s\"\n", cups->header.MediaClass);
-  fprintf(stderr, "DEBUG: Gutenprint MediaColor = \"%s\"\n", cups->header.MediaColor);
-  fprintf(stderr, "DEBUG: Gutenprint MediaType = \"%s\"\n", cups->header.MediaType);
-  fprintf(stderr, "DEBUG: Gutenprint OutputType = \"%s\"\n", cups->header.OutputType);
-
-  fprintf(stderr, "DEBUG: Gutenprint AdvanceDistance = %d\n", cups->header.AdvanceDistance);
-  fprintf(stderr, "DEBUG: Gutenprint AdvanceMedia = %d\n", cups->header.AdvanceMedia);
-  fprintf(stderr, "DEBUG: Gutenprint Collate = %d\n", cups->header.Collate);
-  fprintf(stderr, "DEBUG: Gutenprint CutMedia = %d\n", cups->header.CutMedia);
-  fprintf(stderr, "DEBUG: Gutenprint Duplex = %d\n", cups->header.Duplex);
-  fprintf(stderr, "DEBUG: Gutenprint HWResolution = [ %d %d ]\n", cups->header.HWResolution[0],
+  fprintf(stderr, "DEBUG: Gutenprint   Page data:\n");
+  fprintf(stderr, "DEBUG: Gutenprint     MediaClass = \"%s\"\n", cups->header.MediaClass);
+  fprintf(stderr, "DEBUG: Gutenprint     MediaColor = \"%s\"\n", cups->header.MediaColor);
+  fprintf(stderr, "DEBUG: Gutenprint     MediaType = \"%s\"\n", cups->header.MediaType);
+  fprintf(stderr, "DEBUG: Gutenprint     OutputType = \"%s\"\n", cups->header.OutputType);
+
+  fprintf(stderr, "DEBUG: Gutenprint     AdvanceDistance = %d\n", cups->header.AdvanceDistance);
+  fprintf(stderr, "DEBUG: Gutenprint     AdvanceMedia = %d\n", cups->header.AdvanceMedia);
+  fprintf(stderr, "DEBUG: Gutenprint     Collate = %d\n", cups->header.Collate);
+  fprintf(stderr, "DEBUG: Gutenprint     CutMedia = %d\n", cups->header.CutMedia);
+  fprintf(stderr, "DEBUG: Gutenprint     Duplex = %d\n", cups->header.Duplex);
+  fprintf(stderr, "DEBUG: Gutenprint     HWResolution = [ %d %d ]\n", cups->header.HWResolution[0],
 	  cups->header.HWResolution[1]);
-  fprintf(stderr, "DEBUG: Gutenprint ImagingBoundingBox = [ %d %d %d %d ]\n",
+  fprintf(stderr, "DEBUG: Gutenprint     ImagingBoundingBox = [ %d %d %d %d ]\n",
 	  cups->header.ImagingBoundingBox[0], cups->header.ImagingBoundingBox[1],
 	  cups->header.ImagingBoundingBox[2], cups->header.ImagingBoundingBox[3]);
-  fprintf(stderr, "DEBUG: Gutenprint InsertSheet = %d\n", cups->header.InsertSheet);
-  fprintf(stderr, "DEBUG: Gutenprint Jog = %d\n", cups->header.Jog);
-  fprintf(stderr, "DEBUG: Gutenprint LeadingEdge = %d\n", cups->header.LeadingEdge);
-  fprintf(stderr, "DEBUG: Gutenprint Margins = [ %d %d ]\n", cups->header.Margins[0],
+  fprintf(stderr, "DEBUG: Gutenprint     InsertSheet = %d\n", cups->header.InsertSheet);
+  fprintf(stderr, "DEBUG: Gutenprint     Jog = %d\n", cups->header.Jog);
+  fprintf(stderr, "DEBUG: Gutenprint     LeadingEdge = %d\n", cups->header.LeadingEdge);
+  fprintf(stderr, "DEBUG: Gutenprint     Margins = [ %d %d ]\n", cups->header.Margins[0],
 	  cups->header.Margins[1]);
-  fprintf(stderr, "DEBUG: Gutenprint ManualFeed = %d\n", cups->header.ManualFeed);
-  fprintf(stderr, "DEBUG: Gutenprint MediaPosition = %d\n", cups->header.MediaPosition);
-  fprintf(stderr, "DEBUG: Gutenprint MediaWeight = %d\n", cups->header.MediaWeight);
-  fprintf(stderr, "DEBUG: Gutenprint MirrorPrint = %d\n", cups->header.MirrorPrint);
-  fprintf(stderr, "DEBUG: Gutenprint NegativePrint = %d\n", cups->header.NegativePrint);
-  fprintf(stderr, "DEBUG: Gutenprint NumCopies = %d\n", cups->header.NumCopies);
-  fprintf(stderr, "DEBUG: Gutenprint Orientation = %d\n", cups->header.Orientation);
-  fprintf(stderr, "DEBUG: Gutenprint OutputFaceUp = %d\n", cups->header.OutputFaceUp);
-  fprintf(stderr, "DEBUG: Gutenprint PageSize = [ %d %d ]\n", cups->header.PageSize[0],
+  fprintf(stderr, "DEBUG: Gutenprint     ManualFeed = %d\n", cups->header.ManualFeed);
+  fprintf(stderr, "DEBUG: Gutenprint     MediaPosition = %d\n", cups->header.MediaPosition);
+  fprintf(stderr, "DEBUG: Gutenprint     MediaWeight = %d\n", cups->header.MediaWeight);
+  fprintf(stderr, "DEBUG: Gutenprint     MirrorPrint = %d\n", cups->header.MirrorPrint);
+  fprintf(stderr, "DEBUG: Gutenprint     NegativePrint = %d\n", cups->header.NegativePrint);
+  fprintf(stderr, "DEBUG: Gutenprint     NumCopies = %d\n", cups->header.NumCopies);
+  fprintf(stderr, "DEBUG: Gutenprint     Orientation = %d\n", cups->header.Orientation);
+  fprintf(stderr, "DEBUG: Gutenprint     OutputFaceUp = %d\n", cups->header.OutputFaceUp);
+  fprintf(stderr, "DEBUG: Gutenprint     PageSize = [ %d %d ]\n", cups->header.PageSize[0],
 	  cups->header.PageSize[1]);
-  fprintf(stderr, "DEBUG: Gutenprint Separations = %d\n", cups->header.Separations);
-  fprintf(stderr, "DEBUG: Gutenprint TraySwitch = %d\n", cups->header.TraySwitch);
-  fprintf(stderr, "DEBUG: Gutenprint Tumble = %d\n", cups->header.Tumble);
-  fprintf(stderr, "DEBUG: Gutenprint cupsWidth = %d\n", cups->header.cupsWidth);
-  fprintf(stderr, "DEBUG: Gutenprint cupsHeight = %d\n", cups->header.cupsHeight);
-  fprintf(stderr, "DEBUG: Gutenprint cups->width = %d\n", cups->width);
-  fprintf(stderr, "DEBUG: Gutenprint cups->height = %d\n", cups->height);
-  fprintf(stderr, "DEBUG: Gutenprint cups->adjusted_width = %d\n", cups->adjusted_width);
-  fprintf(stderr, "DEBUG: Gutenprint cups->adjusted_height = %d\n", cups->adjusted_height);
-  fprintf(stderr, "DEBUG: Gutenprint cupsMediaType = %d\n", cups->header.cupsMediaType);
-  fprintf(stderr, "DEBUG: Gutenprint cupsBitsPerColor = %d\n", cups->header.cupsBitsPerColor);
-  fprintf(stderr, "DEBUG: Gutenprint cupsBitsPerPixel = %d\n", cups->header.cupsBitsPerPixel);
-  fprintf(stderr, "DEBUG: Gutenprint cupsBytesPerLine = %d\n", cups->header.cupsBytesPerLine);
-  fprintf(stderr, "DEBUG: Gutenprint cupsColorOrder = %d\n", cups->header.cupsColorOrder);
-  fprintf(stderr, "DEBUG: Gutenprint cupsColorSpace = %d\n", cups->header.cupsColorSpace);
-  fprintf(stderr, "DEBUG: Gutenprint cupsCompression = %d\n", cups->header.cupsCompression);
-  fprintf(stderr, "DEBUG: Gutenprint cupsRowCount = %d\n", cups->header.cupsRowCount);
-  fprintf(stderr, "DEBUG: Gutenprint cupsRowFeed = %d\n", cups->header.cupsRowFeed);
-  fprintf(stderr, "DEBUG: Gutenprint cupsRowStep = %d\n", cups->header.cupsRowStep);
-  fprintf(stderr, "DEBUG: Gutenprint stp_get_driver(v) |%s|\n", stp_get_driver(v));
-  fprintf(stderr, "DEBUG: Gutenprint stp_get_left(v) |%d|\n", stp_get_left(v));
-  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);
+  fprintf(stderr, "DEBUG: Gutenprint     Separations = %d\n", cups->header.Separations);
+  fprintf(stderr, "DEBUG: Gutenprint     TraySwitch = %d\n", cups->header.TraySwitch);
+  fprintf(stderr, "DEBUG: Gutenprint     Tumble = %d\n", cups->header.Tumble);
+  fprintf(stderr, "DEBUG: Gutenprint     cupsWidth = %d\n", cups->header.cupsWidth);
+  fprintf(stderr, "DEBUG: Gutenprint     cupsHeight = %d\n", cups->header.cupsHeight);
+  fprintf(stderr, "DEBUG: Gutenprint     cups->width = %d\n", cups->width);
+  fprintf(stderr, "DEBUG: Gutenprint     cups->height = %d\n", cups->height);
+  fprintf(stderr, "DEBUG: Gutenprint     cups->adjusted_width = %d\n", cups->adjusted_width);
+  fprintf(stderr, "DEBUG: Gutenprint     cups->adjusted_height = %d\n", cups->adjusted_height);
+  fprintf(stderr, "DEBUG: Gutenprint     cupsMediaType = %d\n", cups->header.cupsMediaType);
+  fprintf(stderr, "DEBUG: Gutenprint     cupsBitsPerColor = %d\n", cups->header.cupsBitsPerColor);
+  fprintf(stderr, "DEBUG: Gutenprint     cupsBitsPerPixel = %d\n", cups->header.cupsBitsPerPixel);
+  fprintf(stderr, "DEBUG: Gutenprint     cupsBytesPerLine = %d\n", cups->header.cupsBytesPerLine);
+  fprintf(stderr, "DEBUG: Gutenprint     cupsColorOrder = %d\n", cups->header.cupsColorOrder);
+  fprintf(stderr, "DEBUG: Gutenprint     cupsColorSpace = %d\n", cups->header.cupsColorSpace);
+  fprintf(stderr, "DEBUG: Gutenprint     cupsCompression = %d\n", cups->header.cupsCompression);
+  fprintf(stderr, "DEBUG: Gutenprint     cupsRowCount = %d\n", cups->header.cupsRowCount);
+  fprintf(stderr, "DEBUG: Gutenprint     cupsRowFeed = %d\n", cups->header.cupsRowFeed);
+  fprintf(stderr, "DEBUG: Gutenprint     cupsRowStep = %d\n", cups->header.cupsRowStep);
+  fprintf(stderr, "DEBUG: Gutenprint     stp_get_driver(v) |%s|\n", stp_get_driver(v));
+  fprintf(stderr, "DEBUG: Gutenprint     stp_get_left(v) %d\n", stp_get_left(v));
+  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++)
@@ -229,28 +232,28 @@ print_debug_block(const stp_vars_t *v, const cups_image_t *cups)
       switch (p->p_type)
 	{
 	case STP_PARAMETER_TYPE_STRING_LIST:
-	  fprintf(stderr, "DEBUG: Gutenprint stp_get_string %s(v) |%s| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_string %s(v) |%s| %d\n",
 		  p->name, stp_get_string_parameter(v, p->name) ?
 		  stp_get_string_parameter(v, p->name) : "NULL",
 		  stp_get_string_parameter_active(v, p->name));
 	  break;
 	case STP_PARAMETER_TYPE_DOUBLE:
-	  fprintf(stderr, "DEBUG: Gutenprint stp_get_float %s(v) |%.3f| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_float %s(v) |%.3f| %d\n",
 		  p->name, stp_get_float_parameter(v, p->name),
 		  stp_get_float_parameter_active(v, p->name));
 	  break;
 	case STP_PARAMETER_TYPE_DIMENSION:
-	  fprintf(stderr, "DEBUG: Gutenprint stp_get_dimension %s(v) |%d| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_dimension %s(v) |%d| %d\n",
 		  p->name, stp_get_dimension_parameter(v, p->name),
 		  stp_get_dimension_parameter_active(v, p->name));
 	  break;
 	case STP_PARAMETER_TYPE_INT:
-	  fprintf(stderr, "DEBUG: Gutenprint stp_get_int %s(v) |%d| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_int %s(v) |%d| %d\n",
 		  p->name, stp_get_int_parameter(v, p->name),
 		  stp_get_int_parameter_active(v, p->name));
 	  break;
 	case STP_PARAMETER_TYPE_BOOLEAN:
-	  fprintf(stderr, "DEBUG: Gutenprint stp_get_boolean %s(v) |%d| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_boolean %s(v) |%d| %d\n",
 		  p->name, stp_get_boolean_parameter(v, p->name),
 		  stp_get_boolean_parameter_active(v, p->name));
 	  break;
@@ -261,6 +264,7 @@ print_debug_block(const stp_vars_t *v, const cups_image_t *cups)
 	  break;
 	}
     }
+  fprintf(stderr, "DEBUG: Gutenprint   End page data\n");
   stp_parameter_list_destroy(params);
 }
 
@@ -282,6 +286,8 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
   stp_parameter_list_t params = stp_get_parameter_list(v);
   int nparams = stp_parameter_list_count(params);
   int i;
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint   validating options\n");
   for (i = 0; i < nparams; i++)
     {
       const stp_parameter_t *param = stp_parameter_list_param(params, i);
@@ -292,14 +298,18 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
 	  if (!stp_string_list_is_present
 	      (desc.bounds.str, stp_get_string_parameter(v, desc.name)))
 	    {
-	      const char *val = stp_get_string_parameter(v, desc.name);
-	      fprintf(stderr, "DEBUG: Gutenprint clearing string %s (%s)\n",
-		      desc.name, val ? val : "(null)");
+	      if (! suppress_messages)
+		{
+		  const char *val = stp_get_string_parameter(v, desc.name);
+		  fprintf(stderr, "DEBUG: Gutenprint    clearing string %s (%s)\n",
+			  desc.name, val ? val : "(null)");
+		}
 	      stp_clear_string_parameter(v, desc.name);
 	      if (!desc.read_only && desc.is_mandatory && desc.is_active)
 		{
-		  fprintf(stderr, "DEBUG: Gutenprint setting default string %s to %s\n",
-			  desc.name, desc.deflt.str ? desc.deflt.str : "(null)");
+		  if (! suppress_messages)
+		    fprintf(stderr, "DEBUG: Gutenprint    setting default string %s to %s\n",
+			    desc.name, desc.deflt.str ? desc.deflt.str : "(null)");
 		  stp_set_string_parameter(v, desc.name, desc.deflt.str);
 		  if (strcmp(desc.name, "PageSize") == 0)
 		    {
@@ -307,15 +317,17 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
 			stp_get_papersize_by_name(desc.deflt.str);
 		      if (ps->width > 0)
 			{
-			  fprintf(stderr, "DEBUG: Gutenprint setting page width to %d\n",
-				  ps->width);
+			  if (! suppress_messages)
+			    fprintf(stderr, "DEBUG:    Gutenprint setting page width to %d\n",
+				    ps->width);
 			  if (ps->width < stp_get_page_width(v))
 			    stp_set_page_width(v, ps->width);
 			}
 		      if (ps->height > 0)
 			{
-			  fprintf(stderr, "DEBUG: Gutenprint setting page height to %d\n",
-				  ps->height);
+			  if (! suppress_messages)
+			    fprintf(stderr, "DEBUG:    Gutenprint setting page height to %d\n",
+				    ps->height);
 			  if (ps->height < stp_get_page_height(v))
 			    stp_set_page_height(v, ps->height);
 			}
@@ -325,6 +337,8 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
 	}
       stp_parameter_description_destroy(&desc);
     }
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint   done validating options\n");
   stp_parameter_list_destroy(params);
 }  
 
@@ -335,6 +349,9 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
   int tmp_left, tmp_right, tmp_top, tmp_bottom, tmp_width, tmp_height;
   stp_vars_t *v = stp_vars_create_copy(default_settings);
 
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint  Initialize page\n");
+
   stp_set_page_width(v, cups->header.PageSize[0]);
   stp_set_page_height(v, cups->header.PageSize[1]);
   stp_set_outfunc(v, cups_writefunc);
@@ -392,15 +409,19 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
   if (cups->header.MediaType && strlen(cups->header.MediaType) > 0)
     set_string_parameter(v, "MediaType", cups->header.MediaType);
 
-  fprintf(stderr, "DEBUG: Gutenprint PageSize = %dx%d\n", cups->header.PageSize[0],
-	  cups->header.PageSize[1]);
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint   PageSize = %dx%d\n", cups->header.PageSize[0],
+	    cups->header.PageSize[1]);
 
   if ((size = stp_get_papersize_by_size(cups->header.PageSize[1],
 					cups->header.PageSize[0])) != NULL)
     set_string_parameter(v, "PageSize", size->name);
   else
-    fprintf(stderr, "DEBUG: Gutenprint Unable to get media size for (%d, %d)\n",
-	    cups->header.PageSize[1], cups->header.PageSize[0]);
+    {
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint   UNABLE to get media size for (%d, %d)\n",
+		cups->header.PageSize[1], cups->header.PageSize[0]);
+    }
 
  /*
   * Duplex
@@ -424,10 +445,13 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
 				 &tmp_bottom, &tmp_top);
   stp_get_imageable_area(v, &(cups->left), &(cups->right),
 			 &(cups->bottom), &(cups->top));
-  fprintf(stderr, "DEBUG: Gutenprint limits w %d l %d r %d  h %d t %d b %d\n",
-	  cups->width, cups->left, cups->right, cups->height, cups->top, cups->bottom);
-  fprintf(stderr, "DEBUG: Gutenprint max limits l %d r %d t %d b %d\n",
-	  tmp_left, tmp_right, tmp_top, tmp_bottom);
+  if (! suppress_messages)
+    {
+      fprintf(stderr, "DEBUG: Gutenprint   limits w %d l %d r %d  h %d t %d b %d\n",
+	      cups->width, cups->left, cups->right, cups->height, cups->top, cups->bottom);
+      fprintf(stderr, "DEBUG: Gutenprint   max limits l %d r %d t %d b %d\n",
+	      tmp_left, tmp_right, tmp_top, tmp_bottom);
+    }
 
   if (tmp_left < 0)
     tmp_left = 0;
@@ -448,13 +472,15 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
 	}
       else
 	cups->left_trim = 0;
-      fprintf(stderr, "DEBUG: Gutenprint left margin %d\n", cups->left_trim);
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint   left margin %d\n", cups->left_trim);
     }
   else
     {
       cups->left_trim = 0;
-      fprintf(stderr, "DEBUG: Gutenprint adjusting left margin from %d to %d\n",
-	      cups->left, tmp_left);
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint   adjusting left margin from %d to %d\n",
+		cups->left, tmp_left);
       cups->left = tmp_left;
     }
   if (tmp_right > cups->right)
@@ -466,13 +492,15 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
 	}
       else
 	cups->right_trim = 0;
-      fprintf(stderr, "DEBUG: Gutenprint right margin %d\n", cups->right_trim);
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint   right margin %d\n", cups->right_trim);
     }
   else
     {
       cups->right_trim = 0;
-      fprintf(stderr, "DEBUG: Gutenprint adjusting right margin from %d to %d\n",
-	      cups->right, tmp_right);
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint   adjusting right margin from %d to %d\n",
+		cups->right, tmp_right);
       cups->right = tmp_right;
     }
   if (tmp_top < cups->top)
@@ -484,13 +512,15 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
 	}
       else
 	cups->top_trim = 0;
-      fprintf(stderr, "DEBUG: Gutenprint top margin %d\n", cups->top_trim);
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint   top margin %d\n", cups->top_trim);
     }
   else
     {
       cups->top_trim = 0;
-      fprintf(stderr, "DEBUG: Gutenprint adjusting top margin from %d to %d\n",
-	      cups->top, tmp_top);
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint   adjusting top margin from %d to %d\n",
+		cups->top, tmp_top);
       cups->top = tmp_top;
     }
   if (tmp_bottom > cups->bottom)
@@ -502,13 +532,15 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
 	}
       else
 	cups->bottom_trim = 0;
-      fprintf(stderr, "DEBUG: Gutenprint bottom margin %d\n", cups->bottom_trim);
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint   bottom margin %d\n", cups->bottom_trim);
     }
   else
     {
       cups->bottom_trim = 0;
-      fprintf(stderr, "DEBUG: Gutenprint adjusting bottom margin from %d to %d\n",
-	      cups->bottom, tmp_bottom);
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint   adjusting bottom margin from %d to %d\n",
+		cups->bottom, tmp_bottom);
       cups->bottom = tmp_bottom;
     }
 
@@ -556,10 +588,13 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
   cups->adjusted_height = cups->height;
   if (cups->adjusted_height > cups->header.cupsHeight)
     cups->adjusted_height = cups->header.cupsHeight;
-  fprintf(stderr, "DEBUG: Gutenprint CUPS settings w %d %d l %d r %d  h %d %d t %d b %d\n",
-	  cups->width, cups->adjusted_width, cups->left, cups->right,
-	  cups->height, cups->adjusted_height, cups->top, cups->bottom);
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint   CUPS settings w %d (%d) l %d r %d  h %d (%d) t %d b %d\n",
+	    cups->width, cups->adjusted_width, cups->left, cups->right,
+	    cups->height, cups->adjusted_height, cups->top, cups->bottom);
 
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint  End initialize page\n");
   return v;
 }
 
@@ -569,8 +604,9 @@ purge_excess_data(cups_image_t *cups)
   char *buffer = stp_malloc(cups->header.cupsBytesPerLine);
   if (buffer)
     {
-      fprintf(stderr, "DEBUG: Gutenprint purging %d rows\n",
-	      cups->header.cupsHeight - cups->row);
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint purging %d rows\n",
+		cups->header.cupsHeight - cups->row);
       while (cups->row < cups->header.cupsHeight)
 	{
 	  cupsRasterReadPixels(cups->ras, (unsigned char *)buffer,
@@ -590,6 +626,8 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
   int i;
   const char *val;		/* CUPS option value */
   ppd_option_t *ppd_option;
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint set options:\n");
   val = cupsGetOption("StpiShrinkOutput", num_options, options);
   if (!val)
     {
@@ -629,31 +667,45 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 	    {
 	      double dval = atof(val + 7);
 
-	      fprintf(stderr, "DEBUG: Gutenprint set float %s to %f\n",
-		      desc.name, dval);
+	      if (! suppress_messages)
+		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;
-	      sprintf(ppd_option_name, "StpFine%s", desc.name);
-	      val = cupsGetOption(ppd_option_name, num_options, options);
-	      if (!val)
+	      if (strchr(val, (int) '.'))
+		{
+		  fine_val = atof(val);
+		  if (! suppress_messages)
+		    fprintf(stderr, "DEBUG: Gutenprint   set float %s to %f (%s)\n",
+			    desc.name, fine_val, val);
+		}
+	      else
 		{
-		  ppd_option = ppdFindOption(ppd, ppd_option_name);
-		  if (ppd_option)
-		    val = ppd_option->defchoice;
+		  double coarse_val = atof(val) * 0.001;
+		  sprintf(ppd_option_name, "StpFine%s", desc.name);
+		  val = cupsGetOption(ppd_option_name, num_options, options);
+		  if (!val)
+		    {
+		      ppd_option = ppdFindOption(ppd, ppd_option_name);
+		      if (ppd_option)
+			val = ppd_option->defchoice;
+		    }
+		  if (val && strlen(val) > 0 && strcmp(val, "None") != 0)
+		    fine_val = atof(val) * 0.001;
+		  if (! suppress_messages)
+		    fprintf(stderr, "DEBUG: Gutenprint   set float %s to %f + %f\n",
+			    desc.name, coarse_val, fine_val);
+		  fine_val += coarse_val;
 		}
-	      if (val && strlen(val) > 0 && strcmp(val, "None") != 0)
-		fine_val = atof(val) * 0.001;
-	      fprintf(stderr, "DEBUG: Gutenprint set float %s to %f + %f\n",
-		      desc.name, coarse_val, fine_val);
-	      fine_val += coarse_val;
 	      if (fine_val > desc.bounds.dbl.upper)
 		fine_val = desc.bounds.dbl.upper;
+	      if (fine_val < desc.bounds.dbl.lower)
+		fine_val = desc.bounds.dbl.lower;
 	      stp_set_float_parameter(v, desc.name, fine_val);
 	    }
 	}
@@ -673,53 +725,66 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 	      switch (desc.p_type)
 		{
 		case STP_PARAMETER_TYPE_STRING_LIST:
-		  fprintf(stderr, "DEBUG: Gutenprint set string %s to %s\n",
-			  desc.name, val);
+		  if (! suppress_messages)
+		    fprintf(stderr, "DEBUG: Gutenprint   set string %s to %s\n",
+			    desc.name, val);
 		  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);
+		  if (! suppress_messages)
+		    fprintf(stderr, "DEBUG: Gutenprint   set int %s to %s (%d)\n",
+			    desc.name, val, atoi(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);
+		  if (! suppress_messages)
+		    fprintf(stderr, "DEBUG: Gutenprint   set dimension %s to %s (%d)\n",
+			    desc.name, val, atoi(val));
 
 		  stp_set_dimension_parameter(v, desc.name, atoi(val));
 		  break;
 		case STP_PARAMETER_TYPE_BOOLEAN:
-		  fprintf(stderr, "DEBUG: Gutenprint set bool %s to %s\n",
-			  desc.name, val);
+		  if (! suppress_messages)
+		    fprintf(stderr, "DEBUG: Gutenprint   set bool %s to %s (%d)\n",
+			    desc.name, val, strcasecmp(val, "true") == 0 ? 1 : 0);
 		  stp_set_boolean_parameter
-		    (v, desc.name, strcmp(val, "True") == 0 ? 1 : 0);
+		    (v, desc.name, strcasecmp(val, "true") == 0 ? 1 : 0);
 		  break;
 		case STP_PARAMETER_TYPE_CURVE: /* figure this out later... */
 		case STP_PARAMETER_TYPE_FILE: /* Probably not, security hole */
 		case STP_PARAMETER_TYPE_RAW: /* figure this out later, too */
-		  fprintf(stderr, "DEBUG: Gutenprint ignoring option %s %s type %d\n",
-			  desc.name, val, desc.p_type);
+		  if (! suppress_messages)
+		    fprintf(stderr, "DEBUG: Gutenprint   ignoring option %s %s type %d\n",
+			    desc.name, val, desc.p_type);
 		  break;
 		default:
 		  break;
 		}
 	    }
 	  else if (val)
-	    fprintf(stderr, "DEBUG: Gutenprint NOT setting %s to '%s'\n",
-		    desc.name, val);
+	    {
+	      if (! suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint   NOT setting %s to '%s'\n",
+			desc.name, val);
+	    }
 	  else
-	    fprintf(stderr, "DEBUG: Gutenprint NOT setting %s to (null)\n",
-		    desc.name);
+	    {
+	      if (! suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint   NOT setting %s to (null)\n",
+			desc.name);
+	    }
 	}
       stp_parameter_description_destroy(&desc);
       stp_free(ppd_option_name);
     }
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint end options\n");
   stp_parameter_list_destroy(params);
 }
 
@@ -749,6 +814,9 @@ main(int  argc,				/* I - Number of command-line arguments */
   struct timeval	t1, t2;
   struct timezone	tz;
 
+  if (getenv("STP_SUPPRESS_MESSAGES"))
+    suppress_messages = 1;
+
  /*
   * Initialise libgutenprint
   */
@@ -763,7 +831,8 @@ main(int  argc,				/* I - Number of command-line arguments */
  /*
   * Check for valid arguments...
   */
-  fprintf(stderr, "DEBUG: Gutenprint %s Starting\n", version_id);
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint %s Starting\n", version_id);
 
   if (argc < 6 || argc > 7)
   {
@@ -776,6 +845,16 @@ main(int  argc,				/* I - Number of command-line arguments */
     return (1);
   }
 
+  if (! suppress_messages)
+    {
+      fprintf(stderr, "DEBUG: Gutenprint %s Starting\n", version_id);
+      fprintf(stderr, "DEBUG: Gutenprint command line: %s '%s' '%s' '%s' '%s' %s%s%s%s\n",
+	      argv[0], argv[1], argv[2], argv[3], argv[4], "<args>",
+	      argc >= 7 ? " '" : "",
+	      argc >= 7 ? argv[6] : "",
+	      argc >= 7 ? "'" : "");
+    }
+
  /*
   * Get the PPD file...
   */
@@ -785,7 +864,8 @@ main(int  argc,				/* I - Number of command-line arguments */
     fputs("ERROR: Gutenprint Fatal error: PPD environment variable not set!\n", stderr);
     return (1);
   }
-  fprintf(stderr, "DEBUG: Gutenprint using PPD file %s\n", ppdfile);
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint using PPD file %s\n", ppdfile);
 
   if ((ppd = ppdOpenFile(ppdfile)) == NULL)
   {
@@ -853,15 +933,17 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   num_options = cupsParseOptions(argv[5], 0, &options);
 
-  fprintf(stderr, "DEBUG: Gutenprint CUPS option count is %d (%d bytes)\n",
-	  num_options, strlen(argv[5]));
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint CUPS option count is %d (%d bytes)\n",
+	    num_options, strlen(argv[5]));
 
   if (num_options > 0)
     {
       int i;
       for (i = 0; i < num_options; i++)
-	fprintf(stderr, "DEBUG: Gutenprint    CUPS option %d %s = %s\n",
-		i, options[i].name, options[i].value);
+	if (! suppress_messages)
+	  fprintf(stderr, "DEBUG: Gutenprint    CUPS option %d %s = %s\n",
+		  i, options[i].name, options[i].value);
     }
 
  /*
@@ -879,7 +961,8 @@ main(int  argc,				/* I - Number of command-line arguments */
       ppdClose(ppd);
       return (1);
     }
-  fprintf(stderr, "DEBUG: Gutenprint driver %s\n", ppd->modelname);
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint driver %s\n", ppd->modelname);
 
  /*
   * Open the page stream...
@@ -896,7 +979,8 @@ main(int  argc,				/* I - Number of command-line arguments */
   }
   else
     fd = 0;
-  fprintf(stderr, "DEBUG: Gutenprint using fd %d\n", fd);
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint using fd %d\n", fd);
 
   stp_set_printer_defaults(default_settings, printer);
   stp_set_float_parameter(default_settings, "AppGamma", 1.0);
@@ -912,7 +996,8 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   cups.page = 0;
 
-  fprintf(stderr, "DEBUG: Gutenprint about to start printing loop.\n");
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint about to start printing loop.\n");
 
   /*
    * Read the first page header, which we need in order to set up
@@ -935,12 +1020,16 @@ main(int  argc,				/* I - Number of command-line arguments */
       /*
        * Setup printer driver variables...
        */
+      if (! suppress_messages)
+	{
+	  fprintf(stderr, "DEBUG: Gutenprint printing page %d\n", cups.page + 1);
+	  fprintf(stderr, "PAGE: %d 1\n", cups.page + 1);
+	}
       v = initialize_page(&cups, default_settings);
       stp_set_int_parameter(v, "PageNumber", cups.page);
       cups.row = 0;
-      fprintf(stderr, "DEBUG: Gutenprint printing page %d\n", cups.page + 1);
-      fprintf(stderr, "PAGE: %d 1\n", cups.page + 1);
-      print_debug_block(v, &cups);
+      if (! suppress_messages)
+	print_debug_block(v, &cups);
       print_messages_as_errors = 1;
       if (!stp_verify(v))
 	{
@@ -971,12 +1060,16 @@ main(int  argc,				/* I - Number of command-line arguments */
        */
       if (cups.row < cups.header.cupsHeight)
 	purge_excess_data(&cups);
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint done printing page %d\n", cups.page + 1);
       cups.page ++;
     }
   if (v)
     {
-      fprintf(stderr, "DEBUG: Gutenprint ending job\n");
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint ending job\n");
       stp_end_job(v, &theImage);
+      fflush(stdout);
       stp_vars_destroy(v);
     }
   cupsRasterClose(cups.ras);
@@ -990,12 +1083,21 @@ main(int  argc,				/* I - Number of command-line arguments */
 	  (double) tms.tms_stime / clocks_per_sec,
 	  (double) (t2.tv_sec - t1.tv_sec) +
 	  ((double) (t2.tv_usec - t1.tv_usec)) / 1000000.0);
-  fputs("INFO: Gutenprint Ready to print.\n", stderr);
+  if (! suppress_messages)
+    fputs("INFO: Gutenprint Ready to print.\n", stderr);
   if (fd != 0)
     close(fd);
+  stp_vars_destroy(default_settings);
   return 0;
 
 cups_abort:
+  if (v)
+    {
+      stp_end_job(v, &theImage);
+      fflush(stdout);
+      stp_vars_destroy(v);
+    }
+  cupsRasterClose(cups.ras);
   clk = times(&tms);
   (void) gettimeofday(&t2, &tz);
   clocks_per_sec = sysconf(_SC_CLK_TCK);
@@ -1008,9 +1110,7 @@ cups_abort:
 	  ((double) (t2.tv_usec - t1.tv_usec)) / 1000000.0);
   fputs("ERROR: Gutenprint No pages found!\n", stderr);
   fputs("ERROR: Gutenprint Invalid printer settings!\n", stderr);
-  stp_end_job(v, &theImage);
-  stp_vars_destroy(v);
-  cupsRasterClose(cups.ras);
+  stp_vars_destroy(default_settings);
   if (fd != 0)
     close(fd);
   return 1;
@@ -1129,22 +1229,25 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
 
   if (cups->row < cups->header.cupsHeight)
   {
-    fprintf(stderr, "DEBUG2: Gutenprint reading %d %d\n",
-	    bytes_per_line, cups->row);
+    if (! suppress_messages)
+      fprintf(stderr, "DEBUG2: Gutenprint reading %d %d\n",
+	      bytes_per_line, cups->row);
     while (cups->row <= row && cups->row < cups->header.cupsHeight)
       {
 	if (left_margin > 0)
 	  {
-	    fprintf(stderr, "DEBUG2: Gutenprint tossing left %d (%d)\n",
-		    left_margin, cups->left_trim);
+	    if (! suppress_messages)
+	      fprintf(stderr, "DEBUG2: Gutenprint tossing left %d (%d)\n",
+		      left_margin, cups->left_trim);
 	    throwaway_data(left_margin, cups);
 	  }
 	cupsRasterReadPixels(cups->ras, data, bytes_per_line);
 	cups->row ++;
 	if (margin + right_margin > 0)
 	  {
-	    fprintf(stderr, "DEBUG2: Gutenprint tossing right %d (%d) + %d\n",
-		    right_margin, cups->right_trim, margin);
+	    if (!suppress_messages)
+	      fprintf(stderr, "DEBUG2: Gutenprint tossing right %d (%d) + %d\n",
+		      right_margin, cups->right_trim, margin);
 	    throwaway_data(margin + right_margin, cups);
 	  }
       }
@@ -1197,13 +1300,17 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
   new_percent = (int) (100.0 * cups->row / cups->header.cupsHeight);
   if (new_percent > cups->last_percent)
     {
-      fprintf(stderr, "INFO: Gutenprint Printing page %d, %d%%\n",
-	      cups->page + 1, new_percent);
+      if (! suppress_messages)
+	fprintf(stderr, "INFO: Gutenprint Printing page %d, %d%%\n",
+		cups->page + 1, new_percent);
       cups->last_percent = new_percent;
     }
 
   if (tmp_image_status != STP_IMAGE_STATUS_OK)
-    fprintf(stderr, "DEBUG: Gutenprint image status %d\n", tmp_image_status);
+    {
+      if (! suppress_messages)
+	fprintf(stderr, "DEBUG: Gutenprint image status %d\n", tmp_image_status);
+    }
   return tmp_image_status;
 }
 
@@ -1221,7 +1328,8 @@ Image_height(stp_image_t *image)	/* I - Image */
   if ((cups = (cups_image_t *)(image->rep)) == NULL)
     return (0);
 
-  fprintf(stderr, "DEBUG: Gutenprint: Image_height %d\n", cups->adjusted_height);
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint: Image_height %d\n", cups->adjusted_height);
   return (cups->adjusted_height);
 }
 
@@ -1239,7 +1347,8 @@ Image_init(stp_image_t *image)		/* I - Image */
     return;
   cups->last_percent = 0;
 
-  fprintf(stderr, "INFO: Starting page %d...\n", cups->page + 1);
+  if (! suppress_messages)
+    fprintf(stderr, "INFO: Starting page %d...\n", cups->page + 1);
   /* cups->page + 1 because users expect 1-based counting */
 }
 
@@ -1256,7 +1365,8 @@ Image_conclude(stp_image_t *image)	/* I - Image */
   if ((cups = (cups_image_t *)(image->rep)) == NULL)
     return;
 
-  fprintf(stderr, "INFO: Gutenprint Finished page %d...\n", cups->page + 1);
+  if (! suppress_messages)
+    fprintf(stderr, "INFO: Gutenprint Finished page %d...\n", cups->page + 1);
 }
 
 /*
@@ -1272,11 +1382,12 @@ Image_width(stp_image_t *image)	/* I - Image */
   if ((cups = (cups_image_t *)(image->rep)) == NULL)
     return (0);
 
-  fprintf(stderr, "DEBUG: Gutenprint: Image_width %d\n", cups->adjusted_width);
+  if (! suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint: Image_width %d\n", cups->adjusted_width);
   return (cups->adjusted_width);
 }
 
 
 /*
- * End of "$Id: rastertoprinter.c,v 1.105.2.1 2007/03/02 12:01:16 rlk Exp $".
+ * End of "$Id: rastertoprinter.c,v 1.105.2.6 2008/01/02 01:38:09 rlk Exp $".
  */
diff --git a/src/cups/test-ppds b/src/cups/test-ppds
index 050906a..868b072 100755
--- a/src/cups/test-ppds
+++ b/src/cups/test-ppds
@@ -1,56 +1,20 @@
 #!/bin/sh
 
-status=0
-verbose=0
-strict=0
+rm -rf ppd ppd-stamp
 
-usage() {
-    echo "Usage: run-testpattern [-v] [-s]"
-    exit
-}
+make ppd
 
-set_args() {
-    while true ; do
-	case "$1" in
-	    -h*|--h*) usage ;;
-	    -v) verbose=1 ;;
-	    -s) strict=1 ;;
-	    --) shift; args="$@"; return ;;
-	    *) return ;;
-	esac
-    shift
-    done
-}
+ppd_count=`find ppd \( -name '*.ppd.gz' -o -name '*.ppd' \) -print | wc -l`
 
-set_args `getopt vhs "$@"`
+failures="`find ppd -name '*.ppd*' -print | xargs cupstestppd |grep 'FAIL$' | awk -F: '{print $1}'`"
 
-
-if [ -d ppd ] ; then
-    for f in ppd/* ; do
-	echo -n "$f..."
-	cupstestppd -r -q $f/*
-	if [ $? -ne 0 ] ; then
-	    echo -n "FAILED"
-	    if [ $verbose -ne 0 ] ; then
-		cupstestppd $f/* 2>&1 | grep FAIL
-	    fi
-	    status=1
-	else
-	    cupstestppd -q $f/*
-	    if [ $? -ne 0 ] ; then
-		# Don't actually error if strict checks fail.
-		# These errors are less important, and we'll accept them.
-		echo -n "WARNING: strict checks failed"
-		if [ $verbose -ne 0 ] ; then
-		    cupstestppd $f/* 2>&1 | grep FAIL
-		fi
-		if [ $strict -ne 0 ] ; then
-		    status=1
-		fi
-	    fi
-	fi
-	echo
-    done
+if [ -z "$failures" ] ; then
+    echo "All $ppd_count PPD files pass"
+    exit 0
 fi
 
-exit $status
+echo $failures | xargs cupstestppd
+
+fail_count=`echo "$failures" | wc -l`
+echo "$fail_count/$ppd_count fail"
+exit 1
diff --git a/src/cups/test-rastertogutenprint.in b/src/cups/test-rastertogutenprint.in
new file mode 100755
index 0000000..afa38d7
--- /dev/null
+++ b/src/cups/test-rastertogutenprint.in
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+retval=0
+
+if [ -z "$STP_DATA_PATH" ] ; then
+    STP_DATA_PATH=`pwd`/../main
+    export STP_DATA_PATH
+fi
+
+if [ -z "$STP_MODULE_PATH" ] ; then
+    STP_MODULE_PATH=`pwd`/../main:`pwd`/../main/.libs
+    export STP_MODULE_PATH
+fi
+
+single=''
+all_models=''
+
+usage() {
+    echo "Usage: test-rastertogutenprint [-s] [-v|--valgrind]"
+    exit 0;
+}
+
+set_args() {
+    while true ; do
+	case "$1" in
+	    -s) single=1 ;;
+	    -h*|--h*) usage ;;
+	    -v|--valgrind) valopts='--tool=memcheck' ; valgrind=`expr $valgrind + 1` ;;
+	    -c|--cachegrind) valopts='--tool=cachegrind'; valgrind=4 ;;
+	    -g|--gdb-attach) valopts='--gdb-attach=yes' ;;
+	    --) shift; args="$@"; return ;;
+	    *) return ;;
+	esac
+    shift
+    done
+}
+
+
+set_args `getopt vcgs "$@"`
+
+version="@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@";
+cupsdir="@cups_conf_serverbin@/filter"
+pages='24-26'
+
+if [ ! -x "$cupsdir/cgpdftoraster" -a ! -x "$cupsdir/pdftops" ] ; then
+    echo 'CUPS does not appear to be installed, skipping test'
+    exit 0
+fi
+
+STP_SUPPRESS_MESSAGES=1
+export STP_SUPPRESS_MESSAGES
+
+is_duplicate() {
+    model=`gunzip -c "$1" | grep '^.StpDriverModelFamily' | awk '{print $2}'`
+    for m in $all_models; do
+	if [ "$model" = "$m" ] ; then
+	    skip=1
+	fi
+    done
+    all_models="$model $all_models"
+}
+
+run_rastertogp() {
+    case "$valgrind" in
+	1) valgrind $valopts -q --num-callers=100 --leak-check=yes --error-limit=no ./rastertogutenprint.$version 1 1 1 1 '' ;;
+	2) valgrind $valopts --num-callers=100 --leak-resolution=high --leak-check=yes --error-limit=no ./rastertogutenprint.$version 1 1 1 1 '' ;;
+	3) valgrind $valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes ./rastertogutenprint.$version 1 1 1 1 '' ;;
+	4) valgrind $valopts ./rastertogutenprint.$version 1 1 1 1 '' ;;
+	*) ./rastertogutenprint.$version 1 1 1 1 '' ;;
+    esac
+    if [ $? -ne 0 ] ; then
+	retval=1
+    fi
+    exit $retval
+}
+
+if [ -d ppd/C ] ; then
+    for f in ppd/C/*.ppd* ; do
+	skip=''
+	if [ -n "$single" ] ; then
+	    is_duplicate $f
+	fi
+	if [ -z "$skip" ] ; then
+	    echo "$f "
+	    PPD=$f
+	    export PPD
+	    if [ -x "$cupsdir/cgpdftoraster" ] ; then
+		output="`($cupsdir/cgpdftoraster 1 1 1 1 page-ranges=$pages < ../../doc/gutenprint-users-manual.pdf 2>/dev/null | run_rastertogp > /dev/null) 2>&1`"
+	    else
+		output="`($cupsdir/pdftops 1 1 1 1 page-ranges=$pages < ../../doc/gutenprint-users-manual.pdf 2>/dev/null | $cupsdir/pstops 1 1 1 1 page-ranges=$pages 2>/dev/null | $cupsdir/pstoraster 2>/dev/null | run_rastertogp > /dev/null) 2>&1`"
+	    fi
+	    if [ $? -ne 0 ] ; then
+		retval=1
+	    fi
+	    echo "$output"
+	    echo "$output" |grep ERROR
+	    if [ $? -eq 0 ] ; then
+		retval=1
+	    fi
+	fi
+    done
+fi
+exit $retval
diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in
index 95fee43..c4c7077 100644
--- a/src/escputil/Makefile.in
+++ b/src/escputil/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -19,15 +19,11 @@
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -64,20 +60,20 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_escputil_OBJECTS = d4lib.$(OBJEXT) escputil.$(OBJEXT)
 escputil_OBJECTS = $(am_escputil_OBJECTS)
-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)
+am__DEPENDENCIES_1 =
+escputil_DEPENDENCIES = $(GUTENPRINT_LIBS) $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 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) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(escputil_SOURCES)
 DIST_SOURCES = $(escputil_SOURCES)
 ETAGS = etags
@@ -85,51 +81,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -139,8 +97,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -221,14 +177,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -248,9 +201,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -269,27 +221,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -301,6 +252,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -346,8 +298,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 escputil_SOURCES = d4lib.c escputil.c d4lib.h
 escputil_LDADD = $(GUTENPRINT_LIBS) $(LIBREADLINE_DEPS)
@@ -387,7 +342,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -415,7 +370,7 @@ clean-binPROGRAMS:
 	done
 escputil$(EXEEXT): $(escputil_OBJECTS) $(escputil_DEPENDENCIES) 
 	@rm -f escputil$(EXEEXT)
-	$(LINK) $(escputil_LDFLAGS) $(escputil_OBJECTS) $(escputil_LDADD) $(LIBS)
+	$(LINK) $(escputil_OBJECTS) $(escputil_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -427,22 +382,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escputil.Po@am__quote@
 
 .c.o:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @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 $@ $<
@@ -453,10 +408,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -506,23 +457,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -538,7 +487,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -573,7 +522,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -587,12 +536,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -613,19 +570,23 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool ctags 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-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+	uninstall-binPROGRAMS
 
 
 @SET_MAKE@
diff --git a/src/escputil/d4lib.c b/src/escputil/d4lib.c
index 5525abd..ee36227 100644
--- a/src/escputil/d4lib.c
+++ b/src/escputil/d4lib.c
@@ -52,8 +52,8 @@
 
 
 #ifndef RDTIMEOUT
-#define RDTIMEOUT 2000
-#define WRTIMEOUT 2000
+#define RDTIMEOUT 10000
+#define WRTIMEOUT 10000
 #endif
 
 int d4WrTimeout = WRTIMEOUT;
diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c
index 5394b77..a28cd07 100644
--- a/src/escputil/escputil.c
+++ b/src/escputil/escputil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escputil.c,v 1.87.8.1 2007/05/29 01:47:27 rlk Exp $"
+ * "$Id: escputil.c,v 1.87.8.3 2007/12/29 20:42:25 rlk Exp $"
  *
  *   Printer maintenance utility for EPSON Stylus (R) printers
  *
@@ -150,11 +150,12 @@ Examples: escputil --ink-level --raw-device /dev/usb/lp0\n\
                        Default is the default system printer.\n\
     -r|--raw-device    Specify the name of the device to write to directly\n\
                        rather than going through a printer queue.\n\
+    -m|--model         Specify the printer model.\n\
     -u|--new           The printer is a new printer (Stylus Color 740 or\n\
-                       newer).  Only needed when not using a raw device.\n\
+                       newer).  Only needed when not using a raw device or\n\
+                       when the model is not specified.\n\
     -q|--quiet         Suppress the banner.\n\
     -S|--short-name    Print the short name of the printer with --identify.\n\
-    -m|--model         Specify the precise printer model for head alignment.\n\
     -C|--choices       Specify the number of pattern choices for alignment\n\
     -p|--patterns      Specify the number of sets of patterns for alignment\n");
 #else
@@ -207,6 +208,7 @@ char *printer_model = NULL;
 char printer_cmd[1025];
 int bufpos = 0;
 int isnew = 0;
+int interchangeable_inks = 0;
 int found_unknown_old_printer = 0;
 int print_short_name = 0;
 const stp_printer_t *the_printer_t = NULL;
@@ -286,7 +288,9 @@ main(int argc, char **argv)
 
   /* Set up gettext */
 #ifdef HAVE_LOCALE_H
-  setlocale (LC_ALL, "");
+  char *locale = stp_strdup(setlocale (LC_ALL, ""));
+#endif
+#ifdef ENABLE_NLS
   bindtextdomain (PACKAGE, PACKAGE_LOCALE_DIR);
 #endif
 
@@ -300,9 +304,9 @@ main(int argc, char **argv)
     {
 #if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG)
       int option_index = 0;
-      c = getopt_long(argc, argv, "P:r:iecnasduqm:hlMS", optlist, &option_index);
+      c = getopt_long(argc, argv, "P:r:iecnasduqm:hlMSC:p:", optlist, &option_index);
 #else
-      c = getopt(argc, argv, "P:r:iecnasduqm:hlMS");
+      c = getopt(argc, argv, "P:r:iecnasduqm:hlMSC:p:");
 #endif
       if (c == -1)
 	break;
@@ -649,28 +653,6 @@ do_remote_cmd_only(const char *cmd, int nargs, ...)
 }
 
 static void
-add_string(const char *str, int size)
-{
-  if (size > 0)
-    {
-      memcpy(printer_cmd + bufpos, str, size);
-      bufpos += size;
-    }
-}
-
-static void
-add_newlines(int count)
-{
-  int i;
-  STP_DEBUG(fprintf(stderr, "Add %d newlines\n", count));
-  for (i = 0; i < count; i++)
-    {
-      printer_cmd[bufpos++] = '\r';
-      printer_cmd[bufpos++] = '\n';
-    }
-}
-
-static void
 add_resets(int count)
 {
   int i;
@@ -759,14 +741,54 @@ open_raw_device(void)
   return fd;
 }
 
+static void
+set_printer_model(void)
+{
+  int i = 0;
+  int printer_count = stp_printer_model_count();
+  for (i = 0; i < printer_count; i++)
+    {
+      the_printer_t = stp_get_printer_by_index(i);
+
+      if (strcmp(stp_printer_get_family(the_printer_t), "escp2") == 0)
+	{
+	  const char *short_name = stp_printer_get_driver(the_printer_t);
+	  const char *long_name = stp_printer_get_long_name(the_printer_t);
+	  if (!strcasecmp(printer_model, short_name) ||
+	      !strcasecmp(printer_model, long_name) ||
+	      (!strncmp(short_name, "escp2-", strlen("escp2-")) &&
+	       !strcasecmp(printer_model, short_name + strlen("escp2-"))) ||
+	      (!strncasecmp(long_name, "Epson ", strlen("Epson ")) &&
+	       !strcasecmp(printer_model, long_name + strlen("Epson "))))
+	    {
+	      const stp_vars_t *printvars;
+	      stp_parameter_t desc;
+
+	      printvars = stp_printer_get_defaults(the_printer_t);
+	      stp_describe_parameter(printvars, "SupportsPacketMode",
+				     &desc);
+	      if (desc.p_type == STP_PARAMETER_TYPE_BOOLEAN)
+		isnew = desc.deflt.boolean;
+	      stp_parameter_description_destroy(&desc);
+	      stp_describe_parameter(printvars, "InterchangeableInk",
+				     &desc);
+	      if (desc.p_type == STP_PARAMETER_TYPE_BOOLEAN)
+		interchangeable_inks = desc.deflt.boolean;
+	      stp_parameter_description_destroy(&desc);
+	      STP_DEBUG(fprintf(stderr, "Found it! %s\n", printer_model));
+	      return;
+	    }
+	}
+    }
+  fprintf(stderr, _("Unknown printer %s!\n"), printer_model);
+  the_printer_t = NULL;
+}
+
 static const stp_printer_t *
 initialize_printer(int quiet, int fail_if_not_found)
 {
-  int printer_count = stp_printer_model_count();
-  int found = 0;
   int packet_initialized = 0;
   int fd;
-  int i;
   int credit;
   int retry = 4;
   int tries = 0;
@@ -847,15 +869,16 @@ initialize_printer(int quiet, int fail_if_not_found)
 	  do
 	    {
 	      status = readData(fd, socket_id, (unsigned char*)buf, 1023);
-	      if (status <= -1 )
-		return NULL;
 	      STP_DEBUG(fprintf(stderr, "readData try %d status %d\n",
 				retry, status));
+	      if (status <= -1 )
+		return NULL;
 	    }
 	  while ( (retry-- != 0) && strncmp("di", (char*)buf, 2) &&
 		  strncmp("@EJL ID", (char*)buf, 7));
 	  if (!retry)
 	    {
+	      STP_DEBUG(fprintf(stderr, "No retries left!\n"));
 	      return NULL;
 	    }
 	}
@@ -905,7 +928,10 @@ initialize_printer(int quiet, int fail_if_not_found)
 		  printer_model = c_strdup("escp2-photo");
 		}
 	      else
-		return NULL;
+		{
+		  STP_DEBUG(fprintf(stderr, "Can't get response to @EJL ID\n"));
+		  return NULL;
+		}
 	    }
 	  else
 	    {
@@ -917,38 +943,7 @@ initialize_printer(int quiet, int fail_if_not_found)
 	}
     }
 
-  i = 0;
-  while ((i < printer_count) && !found)
-    {
-      the_printer_t = stp_get_printer_by_index(i);
-
-      if (strcmp(stp_printer_get_family(the_printer_t), "escp2") == 0)
-	{
-	  const char *short_name = stp_printer_get_driver(the_printer_t);
-	  const char *long_name = stp_printer_get_long_name(the_printer_t);
-	  if (!strcasecmp(printer_model, short_name) ||
-	      !strcasecmp(printer_model, long_name) ||
-	      (!strncmp(short_name, "escp2-", strlen("escp2-")) &&
-	       !strcasecmp(printer_model, short_name + strlen("escp2-"))) ||
-	      (!strncasecmp(long_name, "Epson ", strlen("Epson ")) &&
-	       !strcasecmp(printer_model, long_name + strlen("Epson "))))
-	    {
-	      const stp_vars_t *printvars;
-	      stp_parameter_t desc;
-
-	      printvars = stp_printer_get_defaults(the_printer_t);
-	      stp_describe_parameter(printvars, "SupportsPacketMode",
-				     &desc);
-	      if (desc.p_type == STP_PARAMETER_TYPE_BOOLEAN)
-		isnew = desc.deflt.boolean;
-	      stp_parameter_description_destroy(&desc);
-	      found = 1;
-	      STP_DEBUG(fprintf(stderr, "Found it! %s\n", printer_model));
-
-	    }
-	}
-      i++;
-    }
+  set_printer_model();
 
   if (isnew && !packet_initialized)
     {
@@ -956,9 +951,8 @@ initialize_printer(int quiet, int fail_if_not_found)
     }
 
   close(fd);
-  STP_DEBUG(fprintf(stderr, "new? %s found? %s\n", isnew?"yes":"no",
-		    found?"yes":"no"));
-  return (found)?the_printer_t:NULL;
+  STP_DEBUG(fprintf(stderr, "new? %s\n", isnew ? "yes" : "no"));
+  return the_printer_t;
 }
 
 static const stp_printer_t *
@@ -1003,18 +997,18 @@ static const char *aux_colors[] =
     N_("Cyan"),			/* 1 */
     N_("Magenta"),		/* 2 */
     N_("Yellow"),		/* 3 */
-    N_("Unknown"),		/* 4 */
-    N_("Unknown"),		/* 5 */
-    N_("Unknown"),		/* 6 */
-    N_("Unknown"),		/* 7 */
-    N_("Unknown"),		/* 8 */
+    NULL,			/* 4 */
+    NULL,			/* 5 */
+    NULL,			/* 6 */
+    NULL,			/* 7 */
+    NULL,			/* 8 */
     N_("Red"),			/* 9 */
     N_("Blue"),			/* a */
-    N_("Unknown"),		/* b */
-    N_("Unknown"),		/* c */
-    N_("Unknown"),		/* d */
-    N_("Unknown"),		/* e */
-    N_("Unknown"),		/* f */
+    NULL,			/* b */
+    NULL,			/* c */
+    NULL,			/* d */
+    NULL,			/* e */
+    NULL,			/* f */
   };
 static int aux_color_count = sizeof(aux_colors) / sizeof(const char *);
 
@@ -1239,24 +1233,26 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
       STP_DEBUG(fprintf(stderr, "Header: %x param count: %d\n", hdr, total_param_count));
       if (hdr == 0x0f)	/* Always report ink */
 	{
-	  size_t count = (total_param_count - 1) / 3;
+	  size_t count = (total_param_count - 1) / param;
 	  ind = buf + i + 3;
 	  if (cmd == CMD_STATUS)
 	    printf(_("Ink Levels:\n"));
 	  printf("%18s    %20s\n", _("Ink color"), _("Percent remaining"));
 	  for (j = 0; j < count; j++)
 	    {
-	      if (ind[0] < color_count)
+	      if (ind[0] < color_count && param == 3 &&
+		  (interchangeable_inks || ind[1] >= aux_color_count ||
+		   ! aux_colors[(int) ind[1]]))
 		printf("%18s    %20d\n",
 		       gettext(colors_new[(int) ind[0]]), ind[2]);
-	      else if (ind[j] == 0x40 && ind[1] < aux_color_count)
+	      else if (ind[1] < aux_color_count && aux_colors[(int) ind[1]])
 		printf("%18s    %20d\n",
 		       gettext(aux_colors[(int) ind[1]]), ind[2]);
 	      else
 		printf("%8s 0x%2x 0x%2x    %20d\n",
 		       _("Unknown"), (unsigned char) ind[0],
 		       (unsigned char) ind[1], ind[2]);
-	      ind += 3;
+	      ind += param;
 	    }
 	  if (cmd == CMD_STATUS)
 	    printf("\n");
@@ -1362,7 +1358,7 @@ do_status_command_internal(status_cmd_t cmd)
   if (!found_unknown_old_printer)
     STP_DEBUG(fprintf(stderr, "%s found %s%s\n", gettext(cmd_name),
 		      printer ? stp_printer_get_long_name(printer) :
-		      printer_model,
+		      printer_model ? printer_model : "(null)",
 		      printer ? "" : "(Unknown model)"));
 
   fd = open_raw_device();
@@ -1471,7 +1467,7 @@ do_extended_ink_info(int extended_output)
   else
     fprintf(stderr,
 	    "Warning! Printer %s is not known; information may be incomplete or incorrect\n",
-	    printer_model);
+	    printer_model ? printer_model : "(unknown printer)");
 
   fd = open_raw_device();
 
@@ -1599,7 +1595,7 @@ do_extended_ink_info(int extended_output)
 	    {
 	      int j;
 	      printf("%18s    %20s   %12s   %7s\n",
-		     _("Ink color"), _("Percent remaining"), _("Part number"),
+		     _("Ink cartridge"), _("Percent remaining"), _("Part number"),
 		     _("Date"));
 	      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
 		     gettext(stp_string_list_param(color_list, 0)->text),
@@ -1623,7 +1619,7 @@ do_extended_ink_info(int extended_output)
 	    {
 	      int j;
 	      printf("%18s    %20s   %12s   %7s\n",
-		     _("Ink color"), _("Percent remaining"), _("Part number"),
+		     _("Ink cartridge"), _("Percent remaining"), _("Part number"),
 		     _("Date"));
 	      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
 		     gettext(stp_string_list_param(color_list, 0)->text),
@@ -1643,7 +1639,7 @@ do_extended_ink_info(int extended_output)
 	    {
 	      if (i == 0)
 		printf("%18s    %20s   %12s   %7s\n",
-		       _("Ink color"), _("Percent remaining"), _("Part number"),
+		       _("Ink cartridge"), _("Percent remaining"), _("Part number"),
 		       _("Date"));
 	      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
 		     gettext(stp_string_list_param(color_list, i)->text),
@@ -1706,7 +1702,9 @@ do_status(void)
 void
 do_head_clean(void)
 {
-  if (raw_device)
+  if (printer_model)
+    set_printer_model();
+  else if (raw_device)
     (void) get_printer(1, 0);
   initialize_print_cmd(1);
   do_remote_cmd("CH", 2, 0, 0);
@@ -1717,7 +1715,9 @@ do_head_clean(void)
 void
 do_nozzle_check(void)
 {
-  if (raw_device)
+  if (printer_model)
+    set_printer_model();
+  else if (raw_device)
     (void) get_printer(1, 0);
   initialize_print_cmd(1);
   start_remote_sequence();
@@ -1905,7 +1905,7 @@ do_final_alignment(void)
 }
 
 const char *printer_msg =
-N_("This procedure assumes that your printer is an Epson %s.\n"
+N_("This procedure assumes that your printer is an %s.\n"
    "If this is not your printer model, please type control-C now and\n"
    "choose your actual printer model.\n\n"
    "Please place a sheet of paper in your printer to begin the head\n"
@@ -1921,16 +1921,20 @@ do_align(void)
   long answer;
   char *endptr;
   int curpass;
-  const stp_printer_t *printer = get_printer(0, 0);
   stp_parameter_t desc;
   const char *printer_name;
   stp_vars_t *v = stp_vars_create();
 
-  if (!printer || found_unknown_old_printer)
+  if (printer_model)
+    set_printer_model();
+  else if (raw_device)
+    (void) get_printer(0, 0);
+
+  if (!the_printer_t || found_unknown_old_printer)
     return;
 
-  printer_name = stp_printer_get_long_name(printer);
-  stp_set_driver(v, stp_printer_get_driver(printer));
+  printer_name = stp_printer_get_long_name(the_printer_t);
+  stp_set_driver(v, stp_printer_get_driver(the_printer_t));
 
   if (alignment_passes == 0)
     {
diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in
index 830736e..872d850 100644
--- a/src/foomatic/Makefile.in
+++ b/src/foomatic/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -19,15 +19,11 @@
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -67,31 +63,31 @@ CONFIG_CLEAN_FILES = foomatic-generator mk_printerlist
 PROGRAMS = $(noinst_PROGRAMS)
 am_gutenprint_version_OBJECTS = gutenprint-version.$(OBJEXT)
 gutenprint_version_OBJECTS = $(am_gutenprint_version_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/src/main/libgutenprint.la
-gutenprint_version_DEPENDENCIES = $(am__DEPENDENCIES_1)
+gutenprint_version_DEPENDENCIES = $(GUTENPRINT_LIBS)
 am_paper_sizes_OBJECTS = paper_sizes.$(OBJEXT)
 paper_sizes_OBJECTS = $(am_paper_sizes_OBJECTS)
-paper_sizes_DEPENDENCIES = $(am__DEPENDENCIES_1)
+paper_sizes_DEPENDENCIES = $(GUTENPRINT_LIBS)
 am_printer_margins_OBJECTS = printer_margins.$(OBJEXT)
 printer_margins_OBJECTS = $(am_printer_margins_OBJECTS)
-printer_margins_DEPENDENCIES = $(am__DEPENDENCIES_1)
+printer_margins_DEPENDENCIES = $(GUTENPRINT_LIBS)
 am_printer_options_OBJECTS = printer_options.$(OBJEXT)
 printer_options_OBJECTS = $(am_printer_options_OBJECTS)
-printer_options_DEPENDENCIES = $(am__DEPENDENCIES_1)
+printer_options_DEPENDENCIES = $(GUTENPRINT_LIBS)
 am_printers_OBJECTS = printers.$(OBJEXT)
 printers_OBJECTS = $(am_printers_OBJECTS)
-printers_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+printers_DEPENDENCIES = $(GUTENPRINT_LIBS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 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) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(gutenprint_version_SOURCES) $(paper_sizes_SOURCES) \
 	$(printer_margins_SOURCES) $(printer_options_SOURCES) \
 	$(printers_SOURCES)
@@ -103,51 +99,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -157,8 +115,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -239,14 +195,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -266,9 +219,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -287,27 +239,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -319,6 +270,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -364,8 +316,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 DISTDIRS = foomatic-templates-ijs
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS)
@@ -436,19 +391,19 @@ clean-noinstPROGRAMS:
 	done
 gutenprint-version$(EXEEXT): $(gutenprint_version_OBJECTS) $(gutenprint_version_DEPENDENCIES) 
 	@rm -f gutenprint-version$(EXEEXT)
-	$(LINK) $(gutenprint_version_LDFLAGS) $(gutenprint_version_OBJECTS) $(gutenprint_version_LDADD) $(LIBS)
+	$(LINK) $(gutenprint_version_OBJECTS) $(gutenprint_version_LDADD) $(LIBS)
 paper_sizes$(EXEEXT): $(paper_sizes_OBJECTS) $(paper_sizes_DEPENDENCIES) 
 	@rm -f paper_sizes$(EXEEXT)
-	$(LINK) $(paper_sizes_LDFLAGS) $(paper_sizes_OBJECTS) $(paper_sizes_LDADD) $(LIBS)
+	$(LINK) $(paper_sizes_OBJECTS) $(paper_sizes_LDADD) $(LIBS)
 printer_margins$(EXEEXT): $(printer_margins_OBJECTS) $(printer_margins_DEPENDENCIES) 
 	@rm -f printer_margins$(EXEEXT)
-	$(LINK) $(printer_margins_LDFLAGS) $(printer_margins_OBJECTS) $(printer_margins_LDADD) $(LIBS)
+	$(LINK) $(printer_margins_OBJECTS) $(printer_margins_LDADD) $(LIBS)
 printer_options$(EXEEXT): $(printer_options_OBJECTS) $(printer_options_DEPENDENCIES) 
 	@rm -f printer_options$(EXEEXT)
-	$(LINK) $(printer_options_LDFLAGS) $(printer_options_OBJECTS) $(printer_options_LDADD) $(LIBS)
+	$(LINK) $(printer_options_OBJECTS) $(printer_options_LDADD) $(LIBS)
 printers$(EXEEXT): $(printers_OBJECTS) $(printers_DEPENDENCIES) 
 	@rm -f printers$(EXEEXT)
-	$(LINK) $(printers_LDFLAGS) $(printers_OBJECTS) $(printers_LDADD) $(LIBS)
+	$(LINK) $(printers_OBJECTS) $(printers_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -463,22 +418,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printers.Po@am__quote@
 
 .c.o:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @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 $@ $<
@@ -489,10 +444,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -542,23 +493,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -611,7 +560,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -625,12 +574,20 @@ info-am:
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -651,20 +608,23 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
 	clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
 	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-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am
 
 
 @SET_MAKE@
diff --git a/src/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap
index bb0df69..d2efaa9 100644
--- a/src/foomatic/foomatic-printermap
+++ b/src/foomatic/foomatic-printermap
@@ -46,6 +46,8 @@
 #gptofoo bjc-4000 printer/Canon-BJC-4000
 #gptofoo bjc-4300 printer/Canon-BJC-4300
 #gptofoo bjc-4400 printer/Canon-BJC-4400
+#gptofoo bjc-5100 printer/Canon-BJC-5100
+#gptofoo bjc-5500 printer/Canon-BJC-5500
 #gptofoo bjc-50 printer/Canon-BJC-50
 #gptofoo bjc-55 printer/Canon-BJC-55
 #gptofoo bjc-6000 printer/Canon-BJC-6000
@@ -56,6 +58,7 @@
 #gptofoo bjc-7100 printer/Canon-BJC-7100
 #gptofoo bjc-80 printer/Canon-BJC-80
 #gptofoo bjc-8200 printer/Canon-BJC-8200
+#gptofoo bjc-8500 printer/Canon-BJC-8500
 #gptofoo bjc-85 printer/Canon-BJC-85
 #gptofoo canon-cp10 printer/Canon-CP-10
 #gptofoo canon-cp100 printer/Canon-CP-100
@@ -84,6 +87,13 @@
 #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 canon-cp720 printer/Canon-SELPHY-CP-720
+#gptofoo canon-cp730 printer/Canon-SELPHY-CP-730
+#gptofoo canon-cp740 printer/Canon-SELPHY-CP-740
+#gptofoo canon-cp750 printer/Canon-SELPHY-CP-750
+#gptofoo canon-es1 printer/Canon-SELPHY-ES1
+#gptofoo canon-es2 printer/Canon-SELPHY-ES2
+#gptofoo canon-es20 printer/Canon-SELPHY-ES20
 #gptofoo bjc-PIXMA-iP2000 printer/Canon-PIXMA-iP2000
 #gptofoo bjc-PIXMA-iP3000 printer/Canon-PIXMA-iP3000
 #gptofoo bjc-PIXMA-iP3100 printer/Canon-PIXMA-iP3100
@@ -91,13 +101,23 @@
 #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-iP4500 printer/Canon-PIXMA-iP4500
 #gptofoo bjc-PIXMA-iP5000 printer/Canon-PIXMA-iP5000
 #gptofoo bjc-PIXMA-iP5200 printer/Canon-PIXMA-iP5200
+#gptofoo bjc-PIXMA-iP5300 printer/Canon-PIXMA-iP5300
 #gptofoo bjc-PIXMA-iP6700 printer/Canon-PIXMA-iP6700
+#gptofoo bjc-PIXMA-iP8500 printer/Canon-PIXMA-iP8500
+#gptofoo bjc-PIXMA-iX5000 printer/Canon-PIXMA-iX5000
+#gptofoo bjc-PIXMA-Pro9500 printer/Canon-PIXMA-Pro9500
 #gptofoo bjc-MULTIPASS-MP150 printer/Canon-MULTIPASS-MP150
+#gptofoo bjc-MULTIPASS-MP170 printer/Canon-MULTIPASS-MP170
+#gptofoo bjc-MULTIPASS-MP180 printer/Canon-MULTIPASS-MP180
 #gptofoo bjc-MULTIPASS-MP500 printer/Canon-MULTIPASS-MP500
+#gptofoo bjc-MULTIPASS-MP610 printer/Canon-MULTIPASS-MP610
 #gptofoo bjc-MULTIPASS-MP700 printer/Canon-MULTIPASS-MP700
+#gptofoo bjc-MULTIPASS-MP710 printer/Canon-MULTIPASS-MP710
 #gptofoo bjc-MULTIPASS-MP730 printer/Canon-MULTIPASS-MP730
+#gptofoo bjc-MULTIPASS-MP740 printer/Canon-MULTIPASS-MP740
 #gptofoo bjc-MULTIPASS-MP750 printer/Canon-MULTIPASS-MP750
 #gptofoo bjc-MULTIPASS-MP760 printer/Canon-MULTIPASS-MP760
 #gptofoo bjc-MULTIPASS-MP770 printer/Canon-MULTIPASS-MP770
@@ -106,6 +126,7 @@
 #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-i80 printer/Canon-i80
 #gptofoo bjc-i560 printer/Canon-i560
 #gptofoo bjc-i850 printer/Canon-i850
 #gptofoo bjc-i860 printer/Canon-i860
@@ -161,6 +182,7 @@
 #gptofoo escp2-pm4000px printer/Epson-PM_4000PX
 #gptofoo escp2-pm5000c printer/Epson-PM_5000C
 #gptofoo escp2-pm7000c printer/Epson-PM_7000C
+#gptofoo escp2-pm670c printer/Epson-PM_670C
 #gptofoo escp2-pm700c printer/Epson-PM_700C
 #gptofoo escp2-pm730c printer/Epson-PM_730C
 #gptofoo escp2-pm740c printer/Epson-PM_740C
@@ -208,6 +230,7 @@
 #gptofoo escp2-pxv500 printer/Epson-PX_V500
 #gptofoo escp2-pxv600 printer/Epson-PX_V600
 #gptofoo escp2-pxv630 printer/Epson-PX_V630
+#gptofoo escp2-pxv780 printer/Epson-PX_V780
 #gptofoo escp2-picmate printer/Epson-PictureMate
 #gptofoo escp2-picmated printer/Epson-PictureMate_Deluxe
 #gptofoo escp2-picmateflash printer/Epson-PictureMate_Flash
@@ -258,6 +281,8 @@
 #gptofoo escp2-c86 printer/Epson-Stylus_C86
 #gptofoo escp2-c87 printer/Epson-Stylus_C87
 #gptofoo escp2-c88 printer/Epson-Stylus_C88
+#gptofoo escp2-c110 printer/Epson-Stylus_C110
+#gptofoo escp2-c120 printer/Epson-Stylus_C120
 #gptofoo escp2-cx1500 printer/Epson-Stylus_CX1500
 #gptofoo escp2-cx3100 printer/Epson-Stylus_CX3100
 #gptofoo escp2-cx3200 printer/Epson-Stylus_CX3200
@@ -270,16 +295,19 @@
 #gptofoo escp2-cx3810 printer/Epson-Stylus_CX3810
 #gptofoo escp2-cx4100 printer/Epson-Stylus_CX4100
 #gptofoo escp2-cx4200 printer/Epson-Stylus_CX4200
+#gptofoo escp2-cx4400 printer/Epson-Stylus_CX4400
 #gptofoo escp2-cx4500 printer/Epson-Stylus_CX4500
 #gptofoo escp2-cx4600 printer/Epson-Stylus_CX4600
 #gptofoo escp2-cx4700 printer/Epson-Stylus_CX4700
 #gptofoo escp2-cx4800 printer/Epson-Stylus_CX4800
+#gptofoo escp2-cx4900 printer/Epson-Stylus_CX4900
 #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-cx5600 printer/Epson-Stylus_CX5600
 #gptofoo escp2-cx5700 printer/Epson-Stylus_CX5700
 #gptofoo escp2-cx5800 printer/Epson-Stylus_CX5800
 #gptofoo escp2-cx6000 printer/Epson-Stylus_CX6000
@@ -288,10 +316,12 @@
 #gptofoo escp2-cx6500 printer/Epson-Stylus_CX6500
 #gptofoo escp2-cx6600 printer/Epson-Stylus_CX6600
 #gptofoo escp2-cx7000f printer/Epson-Stylus_CX7000F
+#gptofoo escp2-cx7400 printer/Epson-Stylus_CX7400
 #gptofoo escp2-cx7700 printer/Epson-Stylus_CX7700
 #gptofoo escp2-cx7800 printer/Epson-Stylus_CX7800
 #gptofoo escp2-cx8300 printer/Epson-Stylus_CX8300
 #gptofoo escp2-cx8400 printer/Epson-Stylus_CX8400
+#gptofoo escp2-cx9400 printer/Epson-Stylus_CX9400
 #gptofoo escp2 printer/Epson-Stylus_Color
 #gptofoo escp2-1160 printer/Epson-Stylus_Color_1160
 #gptofoo escp2-1500 printer/Epson-Stylus_Color_1500
@@ -324,8 +354,10 @@
 #gptofoo escp2-pro printer/Epson-Stylus_Color_PRO
 #gptofoo escp2-d68 printer/Epson-Stylus_D68
 #gptofoo escp2-d88 printer/Epson-Stylus_D88
+#gptofoo escp2-d120 printer/Epson-Stylus_D120
 #gptofoo escp2-dx3800 printer/Epson-Stylus_DX3800
 #gptofoo escp2-dx3850 printer/Epson-Stylus_DX3850
+#gptofoo escp2-dx4050 printer/Epson-Stylus_DX4050
 #gptofoo escp2-dx4200 printer/Epson-Stylus_DX4200
 #gptofoo escp2-dx4250 printer/Epson-Stylus_DX4250
 #gptofoo escp2-dx4800 printer/Epson-Stylus_DX4800
@@ -391,6 +423,7 @@
 #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-rx595 printer/Epson-Stylus_Photo_RX595
 #gptofoo escp2-rx600 printer/Epson-Stylus_Photo_RX600
 #gptofoo escp2-rx620 printer/Epson-Stylus_Photo_RX620
 #gptofoo escp2-rx630 printer/Epson-Stylus_Photo_RX630
@@ -539,6 +572,7 @@
 #gptofoo hp-lj_1010 printer/HP-LaserJet_1010
 #gptofoo hp-lj_1012 printer/HP-LaserJet_1012
 #gptofoo hp-lj_1015 printer/HP-LaserJet_1015
+#gptofoo hp-lj_1022 printer/HP-LaserJet_1022
 #gptofoo hp-lj_1100 printer/HP-LaserJet_1100
 #gptofoo hp-lj_1100a printer/HP-LaserJet_1100A
 #gptofoo hp-lj_1150 printer/HP-LaserJet_1150
@@ -794,6 +828,8 @@
 #gptofoo samsung-ql-6050 printer/Samsung-QL-6050
 #gptofoo seiko-sj_200 printer/Seiko-SpeedJET_200
 #gptofoo sharp-ar-161 printer/Sharp-AR-161
+#gptofoo sharp-ar-m257 printer/Sharp-AR-M257
+#gptofoo shinko-chcs9045 printer/Shinko-CHC-S9045
 #gptofoo sony-ijp-v100 printer/Sony-IJP-V100
 #gptofoo sony-dppex5 printer/Sony-DPP-EX5
 #gptofoo sony-updp10 printer/Sony-UP-DP10
diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in
index da11a47..d9a27df 100644
--- a/src/ghost/Makefile.in
+++ b/src/ghost/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -19,15 +19,11 @@
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -67,22 +63,27 @@ am__ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES_
 @BUILD_GHOSTSCRIPT_TRUE@am_ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS =  \
 @BUILD_GHOSTSCRIPT_TRUE@	ijsgutenprint.$(OBJEXT)
 ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = $(am_ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/src/main/libgutenprint.la
-am__DEPENDENCIES_2 =
+am__DEPENDENCIES_1 =
 @BUILD_GHOSTSCRIPT_TRUE@ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES =  \
-@BUILD_GHOSTSCRIPT_TRUE@	$(am__DEPENDENCIES_1) \
-@BUILD_GHOSTSCRIPT_TRUE@	$(am__DEPENDENCIES_2)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@BUILD_GHOSTSCRIPT_TRUE@	$(GUTENPRINT_LIBS) \
+@BUILD_GHOSTSCRIPT_TRUE@	$(am__DEPENDENCIES_1)
+ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK =  \
+	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 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) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES)
 DIST_SOURCES = $(am__ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES_DIST)
 ETAGS = etags
@@ -90,51 +91,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -144,8 +107,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -226,14 +187,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -253,9 +211,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -274,27 +231,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -306,6 +262,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -351,8 +308,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 MAINTAINERCLEANFILES = Makefile.in
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) @IJS_CFLAGS@
@@ -394,7 +354,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -422,7 +382,7 @@ clean-binPROGRAMS:
 	done
 ijsgutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT): $(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES) 
 	@rm -f ijsgutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT)
-	$(LINK) $(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) $(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD) $(LIBS)
+	$(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK) $(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -433,22 +393,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ijsgutenprint.Po@am__quote@
 
 .c.o:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @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 $@ $<
@@ -459,10 +419,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -512,23 +468,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -544,7 +498,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -579,7 +533,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -593,12 +547,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -619,19 +581,23 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool ctags 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-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+	uninstall-binPROGRAMS
 
 
 @SET_MAKE@
diff --git a/src/ghost/ijsgutenprint.c b/src/ghost/ijsgutenprint.c
index 58b63ff..3056037 100644
--- a/src/ghost/ijsgutenprint.c
+++ b/src/ghost/ijsgutenprint.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: ijsgutenprint.c,v 1.18 2006/07/04 02:19:15 rlk Exp $
+ *  $Id: ijsgutenprint.c,v 1.18.8.1 2007/12/15 20:35:39 rlk Exp $
  *
  *   IJS server for Gutenprint.
  *
@@ -385,10 +385,10 @@ list_all_parameters(void)
 			stp_malloc(strlen(param->name) + strlen("STP_Enable") + 1);
 		      sprintf(tmp1, "STP_Enable%s", param->name);
 		      stp_string_list_add_string(sl, tmp1, NULL);
-		      free(tmp1);
+		      stp_free(tmp1);
 		    }
 		}
-	      free(tmp);
+	      stp_free(tmp);
 	    }
 	  stp_parameter_list_destroy(params);
 	}
diff --git a/src/gimp/Makefile.in b/src/gimp/Makefile.in
index 83fc3fd..e25eb5b 100644
--- a/src/gimp/Makefile.in
+++ b/src/gimp/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -19,15 +19,11 @@
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -65,19 +61,18 @@ PROGRAMS = $(gimp_plug_in_PROGRAMS)
 am_print_OBJECTS = print-image-gimp.$(OBJEXT) print.$(OBJEXT)
 print_OBJECTS = $(am_print_OBJECTS)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 =  \
-	$(top_builddir)/src/gutenprintui/libgutenprintui.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 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) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(print_SOURCES)
 DIST_SOURCES = $(print_SOURCES)
 ETAGS = etags
@@ -85,51 +80,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -139,8 +96,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -221,14 +176,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -248,9 +200,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -269,27 +220,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -301,6 +251,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -346,8 +297,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(GIMP_CFLAGS)
 print_SOURCES = \
@@ -394,7 +348,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-gimp_plug_inPROGRAMS: $(gimp_plug_in_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(gimp_plug_indir)" || $(mkdir_p) "$(DESTDIR)$(gimp_plug_indir)"
+	test -z "$(gimp_plug_indir)" || $(MKDIR_P) "$(DESTDIR)$(gimp_plug_indir)"
 	@list='$(gimp_plug_in_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -422,7 +376,7 @@ clean-gimp_plug_inPROGRAMS:
 	done
 print$(EXEEXT): $(print_OBJECTS) $(print_DEPENDENCIES) 
 	@rm -f print$(EXEEXT)
-	$(LINK) $(print_LDFLAGS) $(print_OBJECTS) $(print_LDADD) $(LIBS)
+	$(LINK) $(print_OBJECTS) $(print_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -434,22 +388,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Po@am__quote@
 
 .c.o:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @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 $@ $<
@@ -460,10 +414,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -513,23 +463,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -545,7 +493,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(gimp_plug_indir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -581,7 +529,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -595,12 +543,20 @@ info-am:
 
 install-data-am: install-gimp_plug_inPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -621,20 +577,23 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-gimp_plug_inPROGRAMS uninstall-info-am
+uninstall-am: uninstall-gimp_plug_inPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-gimp_plug_inPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-gimp_plug_inPROGRAMS install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-gimp_plug_inPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-gimp_plug_inPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-gimp_plug_inPROGRAMS
 
 
 @SET_MAKE@
diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in
index 0f31ca7..18a85fc 100644
--- a/src/gimp2/Makefile.in
+++ b/src/gimp2/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -19,15 +19,11 @@
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -67,22 +63,21 @@ am__objects_1 = print-image-gimp.$(OBJEXT) print.$(OBJEXT)
 am_gutenprint_OBJECTS = $(am__objects_1) print-gutenprint.$(OBJEXT)
 gutenprint_OBJECTS = $(am_gutenprint_OBJECTS)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 =  \
-	$(top_builddir)/src/gutenprintui2/libgutenprintui2.la
-am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(GUTENPRINTUI2_LIBS)
 am_print_OBJECTS = $(am__objects_1) print-print.$(OBJEXT)
 print_OBJECTS = $(am_print_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 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) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(gutenprint_SOURCES) $(print_SOURCES)
 DIST_SOURCES = $(gutenprint_SOURCES) $(print_SOURCES)
 ETAGS = etags
@@ -90,51 +85,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -144,8 +101,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -226,14 +181,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -253,9 +205,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -274,27 +225,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -306,6 +256,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -351,8 +302,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(GIMP2_CFLAGS)
 COMMON_PRINT_SOURCES = \
@@ -404,7 +358,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-gimp2_plug_inPROGRAMS: $(gimp2_plug_in_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(gimp2_plug_indir)" || $(mkdir_p) "$(DESTDIR)$(gimp2_plug_indir)"
+	test -z "$(gimp2_plug_indir)" || $(MKDIR_P) "$(DESTDIR)$(gimp2_plug_indir)"
 	@list='$(gimp2_plug_in_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -432,10 +386,10 @@ clean-gimp2_plug_inPROGRAMS:
 	done
 gutenprint$(EXEEXT): $(gutenprint_OBJECTS) $(gutenprint_DEPENDENCIES) 
 	@rm -f gutenprint$(EXEEXT)
-	$(LINK) $(gutenprint_LDFLAGS) $(gutenprint_OBJECTS) $(gutenprint_LDADD) $(LIBS)
+	$(LINK) $(gutenprint_OBJECTS) $(gutenprint_LDADD) $(LIBS)
 print$(EXEEXT): $(print_OBJECTS) $(print_DEPENDENCIES) 
 	@rm -f print$(EXEEXT)
-	$(LINK) $(print_LDFLAGS) $(print_OBJECTS) $(print_LDADD) $(LIBS)
+	$(LINK) $(print_OBJECTS) $(print_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -449,22 +403,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Po@am__quote@
 
 .c.o:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @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 $@ $<
@@ -475,10 +429,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -528,23 +478,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -560,7 +508,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(gimp2_plug_indir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -597,7 +545,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -611,12 +559,20 @@ info-am:
 
 install-data-am: install-gimp2_plug_inPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -637,20 +593,23 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-gimp2_plug_inPROGRAMS uninstall-info-am
+uninstall-am: uninstall-gimp2_plug_inPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-gimp2_plug_inPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-gimp2_plug_inPROGRAMS install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-gimp2_plug_inPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-gimp2_plug_inPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-gimp2_plug_inPROGRAMS
 
 
 @SET_MAKE@
diff --git a/src/gutenprintui/Makefile.am b/src/gutenprintui/Makefile.am
index 215dc96..074ba93 100644
--- a/src/gutenprintui/Makefile.am
+++ b/src/gutenprintui/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.5 2005/11/21 11:16:23 rleigh Exp $
+## $Id: Makefile.am,v 1.5.10.1 2007/12/02 02:40:39 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -62,7 +62,9 @@ plist.o: printrcy.o
 
 ## Data
 
+if BUILD_LIBGUTENPRINTUI
 pkgconfigdata_DATA = gutenprintui.pc
+endif
 
 
 ## Rules
diff --git a/src/gutenprintui/Makefile.in b/src/gutenprintui/Makefile.in
index 2da21b8..72d00db 100644
--- a/src/gutenprintui/Makefile.in
+++ b/src/gutenprintui/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -20,15 +20,11 @@
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -77,24 +73,33 @@ am_libgutenprintui_la_OBJECTS = libgutenprintui_la-printrcy.lo \
 	libgutenprintui_la-panel.lo libgutenprintui_la-ui-utils.lo \
 	libgutenprintui_la-print-image-thumbnail.lo
 libgutenprintui_la_OBJECTS = $(am_libgutenprintui_la_OBJECTS)
+libgutenprintui_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libgutenprintui_la_CFLAGS) $(CFLAGS) \
+	$(libgutenprintui_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_LIBGUTENPRINTUI_TRUE@am_libgutenprintui_la_rpath = -rpath \
 @BUILD_LIBGUTENPRINTUI_TRUE@	$(libdir)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 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) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
 LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
-LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+YLWRAP = $(top_srcdir)/scripts/ylwrap
+@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
 YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
-LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
-	$(AM_YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
 SOURCES = $(libgutenprintui_la_SOURCES)
 DIST_SOURCES = $(libgutenprintui_la_SOURCES)
 pkgconfigdataDATA_INSTALL = $(INSTALL_DATA)
@@ -104,51 +109,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -158,8 +125,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -240,14 +205,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -267,9 +229,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -288,27 +249,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -320,6 +280,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -365,8 +326,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 m4datadir = $(datadir)/aclocal
 pkgconfigdatadir = $(libdir)/pkgconfig
@@ -393,7 +357,7 @@ libgutenprintui_la_LDFLAGS = \
 
 AM_LFLAGS = -i
 AM_YFLAGS = -d
-pkgconfigdata_DATA = gutenprintui.pc
+@BUILD_LIBGUTENPRINTUI_TRUE@pkgconfigdata_DATA = gutenprintui.pc
 MAINTAINERCLEANFILES = Makefile.in printrcl.c printrcy.c printrcy.h
 all: all-am
 
@@ -432,7 +396,7 @@ gutenprintui.pc: $(top_builddir)/config.status $(srcdir)/gutenprintui.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -443,7 +407,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -460,10 +424,10 @@ clean-libLTLIBRARIES:
 printrcy.h: printrcy.c
 	@if test ! -f $@; then \
 	  rm -f printrcy.c; \
-	  $(MAKE) printrcy.c; \
+	  $(MAKE) $(AM_MAKEFLAGS) printrcy.c; \
 	else :; fi
 libgutenprintui.la: $(libgutenprintui_la_OBJECTS) $(libgutenprintui_la_DEPENDENCIES) 
-	$(LINK) $(am_libgutenprintui_la_rpath) $(libgutenprintui_la_LDFLAGS) $(libgutenprintui_la_OBJECTS) $(libgutenprintui_la_LIBADD) $(LIBS)
+	$(libgutenprintui_la_LINK) $(am_libgutenprintui_la_rpath) $(libgutenprintui_la_OBJECTS) $(libgutenprintui_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -479,106 +443,82 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-ui-utils.Plo@am__quote@
 
 .c.o:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui_la-printrcy.Tpo $(DEPDIR)/libgutenprintui_la-printrcy.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui_la-printrcl.Tpo $(DEPDIR)/libgutenprintui_la-printrcl.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui_la-plist.Tpo $(DEPDIR)/libgutenprintui_la-plist.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui_la-panel.Tpo $(DEPDIR)/libgutenprintui_la-panel.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui_la-ui-utils.Tpo $(DEPDIR)/libgutenprintui_la-ui-utils.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Tpo $(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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) $<
-	sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
-	rm -f $(LEX_OUTPUT_ROOT).c
+	$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
 
 .y.c:
-	$(YACCCOMPILE) $<
-	if test -f y.tab.h; then \
-	  to=`echo "$*_H" | sed \
-                -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
-                -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
-	  sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \
-            y.tab.h >$*.ht; \
-	  rm -f y.tab.h; \
-	  if cmp -s $*.ht $*.h; then \
-	    rm -f $*.ht ;\
-	  else \
-	    mv $*.ht $*.h; \
-	  fi; \
-	fi
-	if test -f y.output; then \
-	  mv y.output $*.output; \
-	fi
-	sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@
-	rm -f y.tab.c
+	$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-pkgconfigdataDATA: $(pkgconfigdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdatadir)"
+	test -z "$(pkgconfigdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdatadir)"
 	@list='$(pkgconfigdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -643,23 +583,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -675,7 +613,7 @@ check: check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -714,7 +652,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -728,12 +666,20 @@ info-am:
 
 install-data-am: install-pkgconfigdataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -754,22 +700,24 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-pkgconfigdataDATA
+uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pkgconfigdataDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-pkgconfigdataDATA install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-pkgconfigdataDATA
+	uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA
 
 
 @SET_MAKE@
diff --git a/src/gutenprintui/panel.c b/src/gutenprintui/panel.c
index a8b1858..eed8a65 100644
--- a/src/gutenprintui/panel.c
+++ b/src/gutenprintui/panel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: panel.c,v 1.9.6.1 2007/03/02 12:01:17 rlk Exp $"
+ * "$Id: panel.c,v 1.9.6.2 2007/12/15 20:35:39 rlk Exp $"
  *
  *   Main window code for Print plug-in for the GIMP.
  *
@@ -256,6 +256,7 @@ static void plist_build_combo(GtkWidget *combo,
 			      gpointer data);
 static void initialize_thumbnail(void);
 static void set_color_defaults (void);
+static void set_printer_defaults (void);
 static void redraw_color_swatch (void);
 static void color_update (GtkAdjustment *adjustment);
 static void dimension_update (GtkAdjustment *adjustment);
@@ -1942,6 +1943,17 @@ create_printer_settings_frame (void)
   gtk_table_attach_defaults(GTK_TABLE(table), scrolled_window,
 			    0, 6, vpos, vpos + 1);
   gtk_widget_show(scrolled_window);
+  vpos++;
+
+  button = gtk_button_new_with_label (_("Set Printer Option Defaults"));
+  stpui_set_help_data (button, _("Set all printer options to their defaults"));
+  gtk_table_attach(GTK_TABLE(table), button, 0, 6, vpos, vpos + 1,
+		   GTK_EXPAND|GTK_FILL, GTK_SHRINK|GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      GTK_SIGNAL_FUNC (set_printer_defaults), NULL);
+
 }
 
 static void
@@ -5069,6 +5081,64 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt)
 }
 
 static void
+set_printer_defaults (void)
+{
+  int i;
+  for (i = 0; i < current_option_count; i++)
+    {
+      option_t *opt = &(current_options[i]);
+      if (opt->fast_desc->p_level <= MAXIMUM_PARAMETER_LEVEL &&
+	  opt->fast_desc->p_class == STP_PARAMETER_CLASS_FEATURE &&
+	  opt->is_active && !opt->fast_desc->read_only)
+	{
+	  stp_parameter_activity_t active;
+	  gdouble unit_scaler;
+	  switch (opt->fast_desc->p_type)
+	    {
+	    case STP_PARAMETER_TYPE_DOUBLE:
+	      active =
+		stp_get_float_parameter_active(pv->v, opt->fast_desc->name);
+	      stp_set_float_parameter(pv->v, opt->fast_desc->name,
+				      opt->info.flt.deflt);
+	      stp_set_float_parameter_active(pv->v, opt->fast_desc->name,
+					     active);
+	      break;
+	    case STP_PARAMETER_TYPE_DIMENSION:
+	      unit_scaler = units[pv->unit].scale;
+	      active =
+		stp_get_dimension_parameter_active(pv->v,
+						   opt->fast_desc->name);
+	      stp_set_dimension_parameter(pv->v, opt->fast_desc->name,
+					  opt->info.flt.deflt * unit_scaler);
+	      stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name,
+						 active);
+	      break;
+	    case STP_PARAMETER_TYPE_BOOLEAN:
+	      active =
+		stp_get_boolean_parameter_active(pv->v, opt->fast_desc->name);
+	      stp_set_boolean_parameter(pv->v, opt->fast_desc->name,
+					opt->info.bool.deflt);
+	      stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name,
+					       active);
+	      break;
+	    case STP_PARAMETER_TYPE_STRING_LIST:
+	      active =
+		stp_get_string_parameter_active(pv->v, opt->fast_desc->name);
+	      stp_set_string_parameter(pv->v, opt->fast_desc->name,
+				       opt->info.list.default_val);
+	      stp_set_string_parameter_active(pv->v, opt->fast_desc->name,
+					      active);
+	      break;
+	    default:
+	      break;
+	    }
+	}
+    }
+
+  do_all_updates ();
+}
+
+static void
 set_color_defaults (void)
 {
   int i;
diff --git a/src/gutenprintui/plist.c b/src/gutenprintui/plist.c
index 3809eeb..ecd6234 100644
--- a/src/gutenprintui/plist.c
+++ b/src/gutenprintui/plist.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: plist.c,v 1.3.6.1 2007/03/02 12:01:18 rlk Exp $"
+ * "$Id: plist.c,v 1.3.6.2 2007/12/15 20:35:42 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -204,6 +204,28 @@ stpui_build_standard_print_command(const stpui_plist_t *plist,
   return print_cmd;
 }
 
+static void
+append_external_options(char **command, const stp_vars_t *v)
+{
+  stp_string_list_t *external_options;
+  if (! command || ! *command)
+    return;
+  external_options = stp_get_external_options(v);
+  if (external_options)
+    {
+      int count = stp_string_list_count(external_options);
+      int i;
+      for (i = 0; i < count; i++)
+	{
+	  stp_param_string_t *param = stp_string_list_param(external_options, i);
+	  /* No g_shell_quote in glib 1.2...unfortunate */
+	  stp_catprintf(command, " -o'%s'='%s'", param->name, param->text);
+	}
+      stp_string_list_destroy(external_options);
+    }
+}
+
+
 void
 stpui_set_printrc_file(const char *name)
 {
@@ -940,6 +962,7 @@ static void
 stpui_printrc_load_v2(FILE *fp)
 {
   int retval;
+  char *locale;
   yyin = fp;
 
   stpui_printrc_current_printer = NULL;
@@ -1573,14 +1596,18 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
 			}
 		      else	/* Child 2 (printer command) */
 			{
-			  const char *command;
+			  char *command;
 			  if (stpui_plist_get_command_type(printer) ==
 			      COMMAND_TYPE_DEFAULT)
-			    command =
-			      stpui_build_standard_print_command
-			      (printer, stp_get_printer(printer->v));
+			    {
+			      command =
+				stpui_build_standard_print_command
+				(printer, stp_get_printer(printer->v));
+			      append_external_options(&command, printer->v);
+			    }
 			  else
-			    command = stpui_plist_get_custom_command(printer);
+			    command =
+			      (char *) stpui_plist_get_custom_command(printer);
 			  (void) close(2);
 			  (void) close(1);
 			  dup2 (errfd[1], 2);
@@ -1762,5 +1789,5 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
 }
 
 /*
- * End of "$Id: plist.c,v 1.3.6.1 2007/03/02 12:01:18 rlk Exp $".
+ * End of "$Id: plist.c,v 1.3.6.2 2007/12/15 20:35:42 rlk Exp $".
  */
diff --git a/src/gutenprintui/printrcl.c b/src/gutenprintui/printrcl.c
index f4490d4..075fa0a 100644
--- a/src/gutenprintui/printrcl.c
+++ b/src/gutenprintui/printrcl.c
@@ -649,7 +649,7 @@ int yy_flex_debug = 0;
 char *yytext;
 #line 1 "printrcl.l"
 /*		-*-Mode: C-*-
- * "$Id: printrcl.l,v 1.1 2004/09/17 18:38:14 rleigh Exp $"
+ * "$Id: printrcl.l,v 1.10 2004/08/19 03:24:35 rlk Exp $"
  *
  *   printrc parser
  *
diff --git a/src/gutenprintui2/Makefile.am b/src/gutenprintui2/Makefile.am
index 2b49f89..94279a3 100644
--- a/src/gutenprintui2/Makefile.am
+++ b/src/gutenprintui2/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.6 2005/11/21 11:16:23 rleigh Exp $
+## $Id: Makefile.am,v 1.6.10.1 2007/12/02 02:41:10 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -65,7 +65,9 @@ plist.o: printrcy.o
 
 ## Data
 
+if BUILD_LIBGUTENPRINTUI2
 pkgconfigdata_DATA = gutenprintui2.pc
+endif
 
 
 ## Rules
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index 3500a8d..6eed08e 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -20,15 +20,11 @@
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -79,24 +75,33 @@ am_libgutenprintui2_la_OBJECTS = libgutenprintui2_la-printrcy.lo \
 	libgutenprintui2_la-curve.lo libgutenprintui2_la-gammacurve.lo \
 	libgutenprintui2_la-typebuiltins.lo
 libgutenprintui2_la_OBJECTS = $(am_libgutenprintui2_la_OBJECTS)
+libgutenprintui2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libgutenprintui2_la_CFLAGS) $(CFLAGS) \
+	$(libgutenprintui2_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_LIBGUTENPRINTUI2_TRUE@am_libgutenprintui2_la_rpath = -rpath \
 @BUILD_LIBGUTENPRINTUI2_TRUE@	$(libdir)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 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) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
 LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
-LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+YLWRAP = $(top_srcdir)/scripts/ylwrap
+@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
 YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
-LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
-	$(AM_YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
 SOURCES = $(libgutenprintui2_la_SOURCES)
 DIST_SOURCES = $(libgutenprintui2_la_SOURCES)
 pkgconfigdataDATA_INSTALL = $(INSTALL_DATA)
@@ -106,51 +111,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -160,8 +127,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -242,14 +207,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -269,9 +231,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -290,27 +251,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -322,6 +282,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -367,8 +328,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 m4datadir = $(datadir)/aclocal
 pkgconfigdatadir = $(libdir)/pkgconfig
@@ -398,7 +362,7 @@ libgutenprintui2_la_LDFLAGS = \
 
 AM_LFLAGS = -i
 AM_YFLAGS = -d
-pkgconfigdata_DATA = gutenprintui2.pc
+@BUILD_LIBGUTENPRINTUI2_TRUE@pkgconfigdata_DATA = gutenprintui2.pc
 
 # Copied from include/gutenprintui2/Makefile.am
 # This duplication needs fixing somehow
@@ -446,7 +410,7 @@ gutenprintui2.pc: $(top_builddir)/config.status $(srcdir)/gutenprintui2.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -457,7 +421,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -474,10 +438,10 @@ clean-libLTLIBRARIES:
 printrcy.h: printrcy.c
 	@if test ! -f $@; then \
 	  rm -f printrcy.c; \
-	  $(MAKE) printrcy.c; \
+	  $(MAKE) $(AM_MAKEFLAGS) printrcy.c; \
 	else :; fi
 libgutenprintui2.la: $(libgutenprintui2_la_OBJECTS) $(libgutenprintui2_la_DEPENDENCIES) 
-	$(LINK) $(am_libgutenprintui2_la_rpath) $(libgutenprintui2_la_LDFLAGS) $(libgutenprintui2_la_OBJECTS) $(libgutenprintui2_la_LIBADD) $(LIBS)
+	$(libgutenprintui2_la_LINK) $(am_libgutenprintui2_la_rpath) $(libgutenprintui2_la_OBJECTS) $(libgutenprintui2_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -496,127 +460,103 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-ui-utils.Plo@am__quote@
 
 .c.o:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui2_la-printrcy.Tpo $(DEPDIR)/libgutenprintui2_la-printrcy.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui2_la-printrcl.Tpo $(DEPDIR)/libgutenprintui2_la-printrcl.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui2_la-panel.Tpo $(DEPDIR)/libgutenprintui2_la-panel.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui2_la-plist.Tpo $(DEPDIR)/libgutenprintui2_la-plist.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui2_la-ui-utils.Tpo $(DEPDIR)/libgutenprintui2_la-ui-utils.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Tpo $(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui2_la-curve.Tpo $(DEPDIR)/libgutenprintui2_la-curve.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui2_la-gammacurve.Tpo $(DEPDIR)/libgutenprintui2_la-gammacurve.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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
-@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
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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@	mv -f $(DEPDIR)/libgutenprintui2_la-typebuiltins.Tpo $(DEPDIR)/libgutenprintui2_la-typebuiltins.Plo
 @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
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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) $<
-	sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
-	rm -f $(LEX_OUTPUT_ROOT).c
+	$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
 
 .y.c:
-	$(YACCCOMPILE) $<
-	if test -f y.tab.h; then \
-	  to=`echo "$*_H" | sed \
-                -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
-                -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
-	  sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \
-            y.tab.h >$*.ht; \
-	  rm -f y.tab.h; \
-	  if cmp -s $*.ht $*.h; then \
-	    rm -f $*.ht ;\
-	  else \
-	    mv $*.ht $*.h; \
-	  fi; \
-	fi
-	if test -f y.output; then \
-	  mv y.output $*.output; \
-	fi
-	sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@
-	rm -f y.tab.c
+	$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-pkgconfigdataDATA: $(pkgconfigdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdatadir)"
+	test -z "$(pkgconfigdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdatadir)"
 	@list='$(pkgconfigdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -681,23 +621,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -713,7 +651,7 @@ check: check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -752,7 +690,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -766,12 +704,20 @@ info-am:
 
 install-data-am: install-pkgconfigdataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -792,22 +738,24 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-pkgconfigdataDATA
+uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pkgconfigdataDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-pkgconfigdataDATA install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-pkgconfigdataDATA
+	uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA
 
 
 @SET_MAKE@
diff --git a/src/gutenprintui2/panel.c b/src/gutenprintui2/panel.c
index cf4a06b..7fa3de0 100644
--- a/src/gutenprintui2/panel.c
+++ b/src/gutenprintui2/panel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: panel.c,v 1.11.8.2 2007/05/29 01:47:27 rlk Exp $"
+ * "$Id: panel.c,v 1.11.8.3 2007/12/15 20:35:42 rlk Exp $"
  *
  *   Main window code for Print plug-in for the GIMP.
  *
@@ -256,6 +256,7 @@ static void plist_build_combo(GtkWidget *combo,
 			      gpointer data);
 static void initialize_thumbnail(void);
 static void set_color_defaults (void);
+static void set_printer_defaults (void);
 static void redraw_color_swatch (void);
 static void color_update (GtkAdjustment *adjustment);
 static void dimension_update (GtkAdjustment *adjustment);
@@ -1942,6 +1943,17 @@ create_printer_settings_frame (void)
   gtk_table_attach_defaults(GTK_TABLE(table), scrolled_window,
 			    0, 6, vpos, vpos + 1);
   gtk_widget_show(scrolled_window);
+  vpos++;
+
+  button = gtk_button_new_with_label (_("Set Printer Option Defaults"));
+  stpui_set_help_data (button, _("Set all printer options to their defaults"));
+  gtk_table_attach(GTK_TABLE(table), button, 0, 6, vpos, vpos + 1,
+		   GTK_EXPAND|GTK_FILL, GTK_SHRINK|GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  g_signal_connect (G_OBJECT (button), "clicked",
+		    G_CALLBACK (set_printer_defaults), NULL);
+
 }
 
 static void
@@ -5107,6 +5119,64 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt)
 }
 
 static void
+set_printer_defaults (void)
+{
+  int i;
+  for (i = 0; i < current_option_count; i++)
+    {
+      option_t *opt = &(current_options[i]);
+      if (opt->fast_desc->p_level <= MAXIMUM_PARAMETER_LEVEL &&
+	  opt->fast_desc->p_class == STP_PARAMETER_CLASS_FEATURE &&
+	  opt->is_active && !opt->fast_desc->read_only)
+	{
+	  stp_parameter_activity_t active;
+	  gdouble unit_scaler;
+	  switch (opt->fast_desc->p_type)
+	    {
+	    case STP_PARAMETER_TYPE_DOUBLE:
+	      active =
+		stp_get_float_parameter_active(pv->v, opt->fast_desc->name);
+	      stp_set_float_parameter(pv->v, opt->fast_desc->name,
+				      opt->info.flt.deflt);
+	      stp_set_float_parameter_active(pv->v, opt->fast_desc->name,
+					     active);
+	      break;
+	    case STP_PARAMETER_TYPE_DIMENSION:
+	      unit_scaler = units[pv->unit].scale;
+	      active =
+		stp_get_dimension_parameter_active(pv->v,
+						   opt->fast_desc->name);
+	      stp_set_dimension_parameter(pv->v, opt->fast_desc->name,
+					  opt->info.flt.deflt * unit_scaler);
+	      stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name,
+						 active);
+	      break;
+	    case STP_PARAMETER_TYPE_BOOLEAN:
+	      active =
+		stp_get_boolean_parameter_active(pv->v, opt->fast_desc->name);
+	      stp_set_boolean_parameter(pv->v, opt->fast_desc->name,
+					opt->info.bool.deflt);
+	      stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name,
+					       active);
+	      break;
+	    case STP_PARAMETER_TYPE_STRING_LIST:
+	      active =
+		stp_get_string_parameter_active(pv->v, opt->fast_desc->name);
+	      stp_set_string_parameter(pv->v, opt->fast_desc->name,
+				       opt->info.list.default_val);
+	      stp_set_string_parameter_active(pv->v, opt->fast_desc->name,
+					      active);
+	      break;
+	    default:
+	      break;
+	    }
+	}
+    }
+
+  do_all_updates ();
+}
+
+static void
 set_color_defaults (void)
 {
   int i;
diff --git a/src/gutenprintui2/plist.c b/src/gutenprintui2/plist.c
index 96036a4..01d752e 100644
--- a/src/gutenprintui2/plist.c
+++ b/src/gutenprintui2/plist.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: plist.c,v 1.6.10.3 2007/05/29 01:47:28 rlk Exp $"
+ * "$Id: plist.c,v 1.6.10.4 2007/12/15 20:35:43 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -208,6 +208,31 @@ stpui_build_standard_print_command(const stpui_plist_t *plist,
   return print_cmd;
 }
 
+static void
+append_external_options(char **command, const stp_vars_t *v)
+{
+  stp_string_list_t *external_options;
+  if (! command || ! *command)
+    return;
+  external_options = stp_get_external_options(v);
+  if (external_options)
+    {
+      int count = stp_string_list_count(external_options);
+      int i;
+      for (i = 0; i < count; i++)
+	{
+	  stp_param_string_t *param = stp_string_list_param(external_options, i);
+	  char *quoted_name=g_shell_quote(param->name);
+	  char *quoted_value=g_shell_quote(param->text);
+	  stp_catprintf(command, " -o%s=%s", quoted_name, quoted_value);
+	  SAFE_FREE(quoted_name);
+	  SAFE_FREE(quoted_value);
+	}
+      stp_string_list_destroy(external_options);
+    }
+}
+
+
 void
 stpui_set_printrc_file(const char *name)
 {
@@ -939,8 +964,8 @@ static void
 stpui_printrc_load_v2(FILE *fp)
 {
   int retval;
-  yyin = fp;
   char *locale;
+  yyin = fp;
 
   stpui_printrc_current_printer = NULL;
 #ifdef HAVE_LOCALE_H
@@ -1597,14 +1622,18 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
 			}
 		      else	/* Child 2 (printer command) */
 			{
-			  const char *command;
+			  char *command;
 			  if (stpui_plist_get_command_type(printer) ==
 			      COMMAND_TYPE_DEFAULT)
-			    command =
-			      stpui_build_standard_print_command
-			      (printer, stp_get_printer(printer->v));
+			    {
+			      command =
+				stpui_build_standard_print_command
+				(printer, stp_get_printer(printer->v));
+			      append_external_options(&command, printer->v);
+			    }
 			  else
-			    command = stpui_plist_get_custom_command(printer);
+			    command =
+			      (char *) stpui_plist_get_custom_command(printer);
 			  (void) close(2);
 			  (void) close(1);
 			  dup2 (errfd[1], 2);
@@ -1786,5 +1815,5 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
 }
 
 /*
- * End of "$Id: plist.c,v 1.6.10.3 2007/05/29 01:47:28 rlk Exp $".
+ * End of "$Id: plist.c,v 1.6.10.4 2007/12/15 20:35:43 rlk Exp $".
  */
diff --git a/src/gutenprintui2/printrcl.c b/src/gutenprintui2/printrcl.c
index 1c4d8e1..94a58f5 100644
--- a/src/gutenprintui2/printrcl.c
+++ b/src/gutenprintui2/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/main/Makefile.in b/src/main/Makefile.in
index 1d50529..ef0e99e 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -20,15 +20,11 @@
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -73,6 +69,9 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(pkgmodule_LTLIBRARIES)
 color_traditional_la_LIBADD =
 am_color_traditional_la_OBJECTS = print-color.lo color-conversions.lo
 color_traditional_la_OBJECTS = $(am_color_traditional_la_OBJECTS)
+color_traditional_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(color_traditional_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_MODULES_TRUE@am_color_traditional_la_rpath = -rpath \
 @BUILD_MODULES_TRUE@	$(pkgmoduledir)
 am__DEPENDENCIES_1 =
@@ -119,47 +118,72 @@ am_libgutenprint_la_OBJECTS = array.lo bit-ops.lo channel.lo color.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)
+libgutenprint_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libgutenprint_la_LDFLAGS) $(LDFLAGS) -o $@
 print_canon_la_LIBADD =
 am_print_canon_la_OBJECTS = print-canon.lo
 print_canon_la_OBJECTS = $(am_print_canon_la_OBJECTS)
+print_canon_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(print_canon_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_MODULES_TRUE@am_print_canon_la_rpath = -rpath $(pkgmoduledir)
 print_escp2_la_LIBADD =
 am_print_escp2_la_OBJECTS = print-escp2.lo escp2-driver.lo \
 	print-escp2-data.lo escp2-channels.lo escp2-inks.lo \
 	escp2-papers.lo escp2-resolutions.lo
 print_escp2_la_OBJECTS = $(am_print_escp2_la_OBJECTS)
+print_escp2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(print_escp2_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_MODULES_TRUE@am_print_escp2_la_rpath = -rpath $(pkgmoduledir)
 print_lexmark_la_LIBADD =
 am_print_lexmark_la_OBJECTS = print-lexmark.lo
 print_lexmark_la_OBJECTS = $(am_print_lexmark_la_OBJECTS)
+print_lexmark_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(print_lexmark_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_MODULES_TRUE@am_print_lexmark_la_rpath = -rpath $(pkgmoduledir)
 print_olympus_la_LIBADD =
 am_print_olympus_la_OBJECTS = print-olympus.lo
 print_olympus_la_OBJECTS = $(am_print_olympus_la_OBJECTS)
+print_olympus_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(print_olympus_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_MODULES_TRUE@am_print_olympus_la_rpath = -rpath $(pkgmoduledir)
 print_pcl_la_LIBADD =
 am_print_pcl_la_OBJECTS = print-pcl.lo
 print_pcl_la_OBJECTS = $(am_print_pcl_la_OBJECTS)
+print_pcl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(print_pcl_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_MODULES_TRUE@am_print_pcl_la_rpath = -rpath $(pkgmoduledir)
 print_ps_la_LIBADD =
 am_print_ps_la_OBJECTS = print-ps.lo
 print_ps_la_OBJECTS = $(am_print_ps_la_OBJECTS)
+print_ps_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(print_ps_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_MODULES_TRUE@am_print_ps_la_rpath = -rpath $(pkgmoduledir)
 print_raw_la_LIBADD =
 am_print_raw_la_OBJECTS = print-raw.lo
 print_raw_la_OBJECTS = $(am_print_raw_la_OBJECTS)
+print_raw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(print_raw_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_MODULES_TRUE@am_print_raw_la_rpath = -rpath $(pkgmoduledir)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 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) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(color_traditional_la_SOURCES) $(libgutenprint_la_SOURCES) \
 	$(print_canon_la_SOURCES) $(print_escp2_la_SOURCES) \
 	$(print_lexmark_la_SOURCES) $(print_olympus_la_SOURCES) \
@@ -178,51 +202,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -232,8 +218,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -314,14 +298,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -341,9 +322,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -362,27 +342,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -394,6 +373,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -439,8 +419,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 pkgconfigdatadir = $(libdir)/pkgconfig
 pkgxmldatadir = $(pkgdatadir)/$(VERSION)/xml
@@ -610,7 +593,7 @@ gutenprint.pc: $(top_builddir)/config.status $(srcdir)/gutenprint.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -621,7 +604,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -637,7 +620,7 @@ clean-libLTLIBRARIES:
 	done
 install-pkgmoduleLTLIBRARIES: $(pkgmodule_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgmoduledir)" || $(mkdir_p) "$(DESTDIR)$(pkgmoduledir)"
+	test -z "$(pkgmoduledir)" || $(MKDIR_P) "$(DESTDIR)$(pkgmoduledir)"
 	@list='$(pkgmodule_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -648,7 +631,7 @@ install-pkgmoduleLTLIBRARIES: $(pkgmodule_LTLIBRARIES)
 
 uninstall-pkgmoduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(pkgmodule_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(pkgmodule_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkgmoduledir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkgmoduledir)/$$p"; \
@@ -663,23 +646,23 @@ clean-pkgmoduleLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 color-traditional.la: $(color_traditional_la_OBJECTS) $(color_traditional_la_DEPENDENCIES) 
-	$(LINK) $(am_color_traditional_la_rpath) $(color_traditional_la_LDFLAGS) $(color_traditional_la_OBJECTS) $(color_traditional_la_LIBADD) $(LIBS)
+	$(color_traditional_la_LINK) $(am_color_traditional_la_rpath) $(color_traditional_la_OBJECTS) $(color_traditional_la_LIBADD) $(LIBS)
 libgutenprint.la: $(libgutenprint_la_OBJECTS) $(libgutenprint_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libgutenprint_la_LDFLAGS) $(libgutenprint_la_OBJECTS) $(libgutenprint_la_LIBADD) $(LIBS)
+	$(libgutenprint_la_LINK) -rpath $(libdir) $(libgutenprint_la_OBJECTS) $(libgutenprint_la_LIBADD) $(LIBS)
 print-canon.la: $(print_canon_la_OBJECTS) $(print_canon_la_DEPENDENCIES) 
-	$(LINK) $(am_print_canon_la_rpath) $(print_canon_la_LDFLAGS) $(print_canon_la_OBJECTS) $(print_canon_la_LIBADD) $(LIBS)
+	$(print_canon_la_LINK) $(am_print_canon_la_rpath) $(print_canon_la_OBJECTS) $(print_canon_la_LIBADD) $(LIBS)
 print-escp2.la: $(print_escp2_la_OBJECTS) $(print_escp2_la_DEPENDENCIES) 
-	$(LINK) $(am_print_escp2_la_rpath) $(print_escp2_la_LDFLAGS) $(print_escp2_la_OBJECTS) $(print_escp2_la_LIBADD) $(LIBS)
+	$(print_escp2_la_LINK) $(am_print_escp2_la_rpath) $(print_escp2_la_OBJECTS) $(print_escp2_la_LIBADD) $(LIBS)
 print-lexmark.la: $(print_lexmark_la_OBJECTS) $(print_lexmark_la_DEPENDENCIES) 
-	$(LINK) $(am_print_lexmark_la_rpath) $(print_lexmark_la_LDFLAGS) $(print_lexmark_la_OBJECTS) $(print_lexmark_la_LIBADD) $(LIBS)
+	$(print_lexmark_la_LINK) $(am_print_lexmark_la_rpath) $(print_lexmark_la_OBJECTS) $(print_lexmark_la_LIBADD) $(LIBS)
 print-olympus.la: $(print_olympus_la_OBJECTS) $(print_olympus_la_DEPENDENCIES) 
-	$(LINK) $(am_print_olympus_la_rpath) $(print_olympus_la_LDFLAGS) $(print_olympus_la_OBJECTS) $(print_olympus_la_LIBADD) $(LIBS)
+	$(print_olympus_la_LINK) $(am_print_olympus_la_rpath) $(print_olympus_la_OBJECTS) $(print_olympus_la_LIBADD) $(LIBS)
 print-pcl.la: $(print_pcl_la_OBJECTS) $(print_pcl_la_DEPENDENCIES) 
-	$(LINK) $(am_print_pcl_la_rpath) $(print_pcl_la_LDFLAGS) $(print_pcl_la_OBJECTS) $(print_pcl_la_LIBADD) $(LIBS)
+	$(print_pcl_la_LINK) $(am_print_pcl_la_rpath) $(print_pcl_la_OBJECTS) $(print_pcl_la_LIBADD) $(LIBS)
 print-ps.la: $(print_ps_la_OBJECTS) $(print_ps_la_DEPENDENCIES) 
-	$(LINK) $(am_print_ps_la_rpath) $(print_ps_la_LDFLAGS) $(print_ps_la_OBJECTS) $(print_ps_la_LIBADD) $(LIBS)
+	$(print_ps_la_LINK) $(am_print_ps_la_rpath) $(print_ps_la_OBJECTS) $(print_ps_la_LIBADD) $(LIBS)
 print-raw.la: $(print_raw_la_OBJECTS) $(print_raw_la_DEPENDENCIES) 
-	$(LINK) $(am_print_raw_la_rpath) $(print_raw_la_LDFLAGS) $(print_raw_la_OBJECTS) $(print_raw_la_LIBADD) $(LIBS)
+	$(print_raw_la_LINK) $(am_print_raw_la_rpath) $(print_raw_la_OBJECTS) $(print_raw_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -737,22 +720,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml.Plo@am__quote@
 
 .c.o:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @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 $@ $<
@@ -762,13 +745,9 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-pkgconfigdataDATA: $(pkgconfigdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdatadir)"
+	test -z "$(pkgconfigdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdatadir)"
 	@list='$(pkgconfigdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -785,7 +764,7 @@ uninstall-pkgconfigdataDATA:
 	done
 install-pkgxmldataDATA: $(pkgxmldata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgxmldatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgxmldatadir)"
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
 	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -850,23 +829,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -885,7 +862,7 @@ check: check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgmoduledir)" "$(DESTDIR)$(pkgconfigdatadir)" "$(DESTDIR)$(pkgxmldatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -922,7 +899,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -937,12 +914,20 @@ info-am:
 install-data-am: install-pkgconfigdataDATA \
 	install-pkgmoduleLTLIBRARIES install-pkgxmldataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -963,24 +948,26 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-pkgconfigdataDATA uninstall-pkgmoduleLTLIBRARIES \
-	uninstall-pkgxmldataDATA
+uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA \
+	uninstall-pkgmoduleLTLIBRARIES uninstall-pkgxmldataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
 	clean-generic clean-libLTLIBRARIES clean-libtool \
 	clean-pkgmoduleLTLIBRARIES 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-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pkgconfigdataDATA \
-	install-pkgmoduleLTLIBRARIES install-pkgxmldataDATA \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-libLTLIBRARIES \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-pkgconfigdataDATA install-pkgmoduleLTLIBRARIES \
+	install-pkgxmldataDATA install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
 	uninstall-pkgconfigdataDATA uninstall-pkgmoduleLTLIBRARIES \
 	uninstall-pkgxmldataDATA
 
diff --git a/src/main/buffer-image.c b/src/main/buffer-image.c
index 030d398..8113a90 100644
--- a/src/main/buffer-image.c
+++ b/src/main/buffer-image.c
@@ -120,6 +120,8 @@ buffered_image_conclude(stp_image_t * image)
 	if(priv->image->conclude)
 		priv->image->conclude(priv->image);
 
+	stp_free(priv);
+	stp_free(image);
 }
 
 stp_image_t*
@@ -141,6 +143,7 @@ stpi_buffer_image(stp_image_t* image, unsigned int flags)
 	buffered_image->width = buffered_image_width;
 	buffered_image->height = buffered_image_height;
 	buffered_image->get_row = buffered_image_get_row;
+	buffered_image->conclude = buffered_image_conclude;
 	priv->image = image;
 	priv->flags = flags;
 	if(image->get_appname)
diff --git a/src/main/canon-inks.h b/src/main/canon-inks.h
index 458cb2a..a3a3fbb 100644
--- a/src/main/canon-inks.h
+++ b/src/main/canon-inks.h
@@ -280,6 +280,18 @@ static const canon_inkset_t canon_9_C3M3Y2K2_inkset[] = {
         {0,0.0,NULL},
 };
 
+static const canon_inkset_t canon_9_C4M4Y4K2_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},
+        {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},
@@ -292,6 +304,7 @@ static const canon_inkset_t canon_9_C3M3Y2K2_c_inkset[] = {
         {0,0.0,NULL}
 };
 
+/* iP4000 default print mode (quality 2) */
 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},
@@ -304,18 +317,47 @@ static const canon_inkset_t canon_9_C3M3Y2K2k3_c_inkset[] = {
         {0,0.0,NULL}
 };
 
-static const canon_inkset_t canon_9_C4M4Y4K2c4m4k4_inkset[] = {
+/* iP4000 mode used for Super Photo Paper (quality 1) */
+static const canon_inkset_t canon_9_C3M3Y3K2c3m3k3_c_inkset[] = {
+        {'C',1.0,&canon_2b_3l_c_ink},
+        {'M',1.0,&canon_2b_3l_c_ink},
+        {'Y',1.0,&canon_2b_3l_c_ink},
+        {'K',0.0,&canon_1b_2l_ink},
+        {'c',0.5,&canon_2b_3l_c_ink},
+        {'m',0.5,&canon_2b_3l_c_ink},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_3l_c_ink},
+        {0,0.0,NULL}
+};
+
+/* iP4000 mode used for T-Shirt (quality 2) */
+static const canon_inkset_t canon_9_C4M4Y4K2k4_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},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+};
+
+/* iP4000 mode used for CD printing (quality 3) */
+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',0.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},
+        {'k',1.0,&canon_2b_4l_ink},
         {0,0.0,NULL}
 };
 
+
+/* iP4000 mode used for Professional Photo Paper in Quality 4 */
 static const canon_inkset_t canon_9_C8M8Y8c16m16k8_inkset[] = {
         {'C',1.0,&canon_4b_8l_ink},
         {'M',1.0,&canon_4b_8l_ink},
@@ -328,6 +370,21 @@ static const canon_inkset_t canon_9_C8M8Y8c16m16k8_inkset[] = {
         {0,0.0,NULL}
 };
 
+/* PIXMA Pro9500, PIXMA iP8500 */
+static const canon_inkset_t canon_11_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},
+        {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_13_C3M3Y2K2_inkset[] = {
         {'C',1.0,&canon_2b_3l_ink},
         {'M',1.0,&canon_2b_3l_ink},
@@ -344,6 +401,23 @@ static const canon_inkset_t canon_13_C3M3Y2K2_inkset[] = {
         {0,0.0,NULL},
 };
 
+static const canon_inkset_t canon_13_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},
+        {'k',0.0,&canon_2b_3l_c_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},
+};
+
+
 static const canon_inkset_t canon_19_C3M3Y3k3_inkset[] = {
         {'C',1.0,&canon_2b_3l_ink},
         {'M',1.0,&canon_2b_3l_ink},
@@ -391,6 +465,31 @@ static const canon_inkset_t canon_22_C3M3Y2K2k3_c_inkset[] = {
         {0,0.0,NULL},
 };
 
+static const canon_inkset_t canon_22_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},
+        {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},
@@ -416,5 +515,30 @@ static const canon_inkset_t canon_22_C4M4Y4K2c4m4k4_inkset[] = {
         {0,0.0,NULL},
 };
 
+static const canon_inkset_t canon_22_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},
+        {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},
+        {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
index d6ed971..11e5ef2 100644
--- a/src/main/canon-media.h
+++ b/src/main/canon-media.h
@@ -79,12 +79,6 @@ typedef struct {
   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;
@@ -110,35 +104,35 @@ static const canon_paperlist_t name##_paperlist = {     \
 /* 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 },
+  { "Plain",		N_ ("Plain Paper"),		0x00, 0x00,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		0x02, 0x02,1.00, 1.00, 0.900, 0, 0, 0 },
+  { "BackPrint",	N_ ("Back Print Film"),		0x03, 0x03,1.00, 1.00, 0.900, 0, 0, 0 },
+  { "Fabric",		N_ ("Fabric Sheets"),		0x04, 0x04,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),		0x08, 0x08,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),	0x07, 0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),	0x03, 0x03,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyFilm",	N_ ("High Gloss Film"),		0x06, 0x06,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),	0x05, 0x05,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "GlossyCard",	N_ ("Glossy Photo Cards"),	0x0a, 0x0a,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),		0x09, 0x09,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "Other",		N_ ("Other"),                   0x00, 0x00,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 }, 
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency", 	N_ ("Transparencies"),			0x02,0x02,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Photo Paper Matte"),		0x0a,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "CD",		N_ ("CD"),				0x00,0x12,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 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photoper Plus Double-Sided"),	0x10,0x15,0.78, 0.25, 0.500, 0, 0, 0 },
 };
 DECLARE_PAPERS(canon_PIXMA_iP4000);
 
diff --git a/src/main/canon-modes.h b/src/main/canon-modes.h
index 42e7f8b..815481b 100644
--- a/src/main/canon-modes.h
+++ b/src/main/canon-modes.h
@@ -27,6 +27,36 @@
 #ifndef GUTENPRINT_INTERNAL_CANON_MODES_H
 #define GUTENPRINT_INTERNAL_CANON_MODES_H
 
+static const char iP4200_300dpi_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 */  "1.60 1.60 1.60 1.60 1.60 1.60 1.60 1.60 "  /* B */
+/* B */  "1.60 1.60 1.60 1.60 1.60 1.60 1.60 1.60 "  /* M */
+/* M */  "1.60 1.60 1.55 1.50 1.45 1.40 1.35 1.35 "  /* R */
+/* R */  "1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 "  /* Y */
+/* Y */  "1.35 1.42 1.51 1.58 1.60 1.60 1.60 1.60 "  /* G */
+/* G */  "1.60 1.60 1.60 1.60 1.60 1.60 1.60 1.60 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char iP4200_300dpi_draft_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 */  "2.13 2.15 2.20 2.25 2.30 2.35 2.40 2.40 "  /* B */
+/* B */  "2.40 2.40 2.35 2.30 2.22 2.10 2.08 1.92 "  /* M */
+/* M */  "1.90 1.85 1.80 1.70 1.60 1.55 1.42 1.35 "  /* R */
+/* R */  "1.35 1.35 1.35 1.35 1.30 1.34 1.38 1.40 "  /* Y */
+/* Y */  "1.40 1.45 1.55 1.68 1.80 1.92 2.02 2.10 "  /* G */
+/* G */  "2.10 2.05 1.95 1.90 2.00 2.10 2.11 2.13 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
 /* delay settings 
  sometimes the raster data has to be sent 
  | K     |
@@ -74,12 +104,15 @@ typedef struct {
 #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 */
+#define MODE_FLAG_PRO 0x8              /* special ink settings for the PIXMA Pro9500 */
+#define MODE_FLAG_IP8500 0x10          /* special ink settings for the PIXMA iP8500 */
   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.     */
+  const int quality;                   /* quality (unused for some printers, default is usually 2) */
 } canon_mode_t;
 
 #define INKSET(a) sizeof(canon_##a##_inkset)/sizeof(canon_inkset_t),canon_##a##_inkset
@@ -103,65 +136,65 @@ static const canon_modelist_t name##_modelist = {      \
 
 /* 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},
+  {  180, 180,CANON_INK_K,"180x180dpi",N_("180x180 DPI"),INKSET(1_K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_K,"360x360dpi",N_("360x360 DPI"),INKSET(1_K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  720, 360,CANON_INK_K,"720x360dpi",N_("720x360 DPI"),INKSET(1_K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 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},
+              "360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
   {  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},
+              "360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
   {  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},
+              "720x360dpi",N_("720x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 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},
+  {   90,  90,CANON_INK_K | CANON_INK_CMY,"90x90dpi",N_("90x90 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  180, 180,CANON_INK_K | CANON_INK_CMY,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  720, 360,CANON_INK_K | CANON_INK_CMY,"720x360dpi",N_("720x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 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},
+  {   90,  90,CANON_INK_K | CANON_INK_CMY,"90x90dpi",N_("90x90 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  180, 180,CANON_INK_K | CANON_INK_CMY,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dmt",N_("360x360 DMT"),INKSET(4_C4M4Y4K4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  720, 360,CANON_INK_K | CANON_INK_CMY,"720x360dpi",N_("720x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 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},
+  {  180, 180,CANON_INK_CMYK,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_CMYK,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 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},
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  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,2},
+  {  720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  { 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,2},
 };
 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},
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  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,2},
+  {  720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  { 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,2},
 };
 DECLARE_MODES(canon_BJC_4300,0);
 
@@ -169,88 +202,108 @@ 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},
+              "360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
   {  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},
+              "720x360dpi",N_("720x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 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},
+  {  180, 180,CANON_INK_CMYK | CANON_INK_CcMmYK,"180x180dpi",N_("180x180 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 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},
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.8,1.0,NULL,NULL,NULL,2},
+  {  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,2},
+  {  720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  { 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,2},
 };
 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},
+  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYyK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,3.5,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.8,1.0,NULL,NULL,NULL,2},
+  { 1200, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"1200x600dpi",N_("1200x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 DECLARE_MODES(canon_BJC_7000,0);
 
+static const canon_mode_t canon_BJC_i560_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,2},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.8,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_BJC_i560,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},
+  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYyK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  { 1200, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"1200x600dpi",N_("1200x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 DECLARE_MODES(canon_BJC_7100,0);
 
+static const canon_mode_t canon_BJC_i80_modes[] = {
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_BJC_i80,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},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  { 1200,1200,CANON_INK_CMYK,"1200x1200dpi",N_("1200x1200 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 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},
+  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 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},
+              "360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,delay_S200,2.0,1.0,NULL,NULL,NULL,2},
   {  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},
+              "720x720dpi",N_("720x720 DPI"),INKSET(4_C2M2Y2K2),MODE_FLAG_WEAVE,delay_S200,1.0,1.0,NULL,NULL,NULL,2},
   { 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},
+              "1440x720dpi",N_("1440x720 DPI"),INKSET(4_C2M2Y2K2),MODE_FLAG_WEAVE,delay_S200,0.5,1.0,NULL,NULL,NULL,2},
   { 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},
+              "1440x1440dpi",N_("1440x1440 DPI"),INKSET(4_C2M2Y2K2),MODE_FLAG_WEAVE,delay_S200,0.3,1.0,NULL,NULL,NULL,2},
 };
 DECLARE_MODES(canon_S200,0);
 
+static const canon_mode_t canon_S500_modes[] = {
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+/*  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, */
+};
+DECLARE_MODES(canon_S500,2);
 
 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},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 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},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  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,2},
 };
-DECLARE_MODES(canon_PIXMA_iP3000,0);
+DECLARE_MODES(canon_PIXMA_iP3000,1);
 
 
 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},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  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,2},
 /*  {  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}, */
 };
@@ -258,28 +311,52 @@ 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},
+  /* Q0 - fastest mode (in windows driver it's Q5, printer uses 50% of ink ( I think )) */
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,iP4200_300dpi_draft_lum_adjustment,NULL,NULL,0},
+  /* Q1 - normal 300x300 mode (in windows driver it's Q4 - normal darkness of printout ) */
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,iP4200_300dpi_lum_adjustment,NULL,NULL,1},
+  /* Q2 - standard mode for this driver (in windows driver it's Q3) */
+  {  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,2},
  /* {  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);
+DECLARE_MODES(canon_PIXMA_iP4200,2);
 
 
 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},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(19_C3M3Y3k3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 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},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 DECLARE_MODES(canon_MULTIPASS_MP150,0);
 
+static const canon_mode_t canon_PIXMA_iP5300_modes[] = {
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP5300,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},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 DECLARE_MODES(canon_MULTIPASS_MP830,0);
 
+static const canon_mode_t canon_PIXMA_iX5000_modes[] = {
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iX5000,0);
+
+static const canon_mode_t canon_PIXMA_Pro9500_modes[] = {
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_Pro9500,0);
+
+static const canon_mode_t canon_PIXMA_iP8500_modes[] = {
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP8500,0);
+
 #endif
 
diff --git a/src/main/canon-printers.h b/src/main/canon-printers.h
index 82a0536..b136a41 100644
--- a/src/main/canon-printers.h
+++ b/src/main/canon-printers.h
@@ -29,7 +29,7 @@
 
 
 typedef struct canon_caps {
-  int model;          /* model number as used in printers.xml */
+  const char* name;   /* model name */
   int model_id;       /* model ID code for use in commands */
   int max_width;      /* maximum printable paper size */
   int max_height;
@@ -93,6 +93,51 @@ static const char standard_hue_adjustment[] =
 "</curve>\n"
 "</gutenprint>\n";
 
+static const char iP4200_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 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* R */
+/* R */  "1.00 1.00 1.05 1.10 1.20 1.26 1.34 1.41 "  /* Y */
+/* Y */  "1.38 1.32 1.24 1.15 1.08 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 iP4200_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.52 0.56 0.61 0.67 0.79 0.86 0.91 0.98 "  /* B */
+/* B */  "0.97 0.87 0.84 0.81 0.78 0.76 0.74 0.73 "  /* M */
+/* M */  "0.74 0.76 0.78 0.83 0.86 0.90 0.98 1.04 "  /* R */
+/* R */  "1.04 1.04 1.04 1.04 1.03 1.03 1.03 1.02 "  /* Y */
+/* Y */  "1.02 0.97 0.92 0.88 0.83 0.78 0.74 0.71 "  /* G */
+/* G */  "0.70 0.62 0.59 0.53 0.48 0.52 0.53 0.51 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char iP4200_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 -.20 -.30 -.40 -.40 -.30 -.20 0.00 "  /* B */
+/* B */  "0.00 -.04 -.01 0.08 0.14 0.16 0.09 0.00 "  /* M */
+/* M */  "0.00 0.00 -.05 -.07 -.10 -.08 -.06 0.00 "  /* R */
+/* R */  "0.00 0.04 0.08 0.10 0.13 0.10 0.07 0.00 "  /* Y */
+/* Y */  "0.00 -.11 -.18 -.23 -.30 -.37 -.46 -.54 "  /* G */
+/* G */  "-.53 -.52 -.57 -.50 -.41 -.25 -.17 0.00 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
 static const char* control_cmd_ackshort[] = {
   "AckTime=Short",
   NULL
@@ -106,7 +151,13 @@ static const char* control_cmd_PIXMA_iP4000[] = {
   NULL
 };
 
-
+static const char* control_cmd_PIXMA_iP4200[] = {
+/*"SetTime=20060722092503", */         /*original driver sends current time, is it needed?*/
+  "SetSilent=OFF",
+  "PEdgeDetection=ON",
+  NULL
+};
+ 
 static const char* control_cmd_MULTIPASS_MP150[] = {
   "AckTime=Short",
   "MediaDetection=ON",
@@ -115,6 +166,19 @@ static const char* control_cmd_MULTIPASS_MP150[] = {
 
 static const canon_cap_t canon_model_capabilities[] =
 {
+  /* the first printer is used as default in case something has gone wrong in printers.xml */
+  { /* Canon MULTIPASS MP830 */
+    "PIXMA MP830", 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
+  },
   /* ******************************** */
   /*                                  */
   /* tested and color-adjusted models */
@@ -131,7 +195,7 @@ static const canon_cap_t canon_model_capabilities[] =
   /* ************************************ */
 
   { /* Canon S200x *//* heads: BC-24 */
-    4202, 3,
+    "S200", 3,
     618, 936,       /* 8.58" x 13 " */
     10, 10, 9, 20,
     &canon_default_slotlist,
@@ -144,7 +208,7 @@ static const canon_cap_t canon_model_capabilities[] =
   },
 
   { /* Canon BJC S300 */
-    8201, 3,
+    "S300", 3,
     842, 17*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -157,7 +221,7 @@ static const canon_cap_t canon_model_capabilities[] =
   },
 
   { /* Canon  BJ 30   *//* heads: BC-10 */
-    30, 1,
+    "30", 1,
     9.5*72, 14*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -169,7 +233,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon  BJC 85  *//* heads: BC-20 BC-21 BC-22 */
-    85, 1,
+    "85", 1,
     9.5*72, 14*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -182,7 +246,7 @@ static const canon_cap_t canon_model_capabilities[] =
   },
 
   { /* Canon BJC 4300 *//* heads: BC-20 BC-21 BC-22 BC-29 */
-    4300, 1,
+    "4300", 1,
     618, 936,      /* 8.58" x 13 " */
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -195,7 +259,7 @@ static const canon_cap_t canon_model_capabilities[] =
   },
 
   { /* Canon BJC 4400 *//* heads: BC-20 BC-21 BC-22 BC-29 */
-    4400, 1,
+    "4400", 1,
     9.5*72, 14*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -208,7 +272,7 @@ static const canon_cap_t canon_model_capabilities[] =
   },
 
   { /* Canon BJC 6000 *//* heads: BC-30/BC-31 BC-32/BC-31 */
-    6000, 3,
+    "6000", 3,
     618, 936,      /* 8.58" x 13 " */
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -221,7 +285,7 @@ static const canon_cap_t canon_model_capabilities[] =
   },
 
   { /* Canon BJC 6200 *//* heads: BC-30/BC-31 BC-32/BC-31 */
-    6200, 3,
+    "6200", 3,
     618, 936,      /* 8.58" x 13 " */
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -234,7 +298,7 @@ static const canon_cap_t canon_model_capabilities[] =
   },
 
   { /* Canon BJC 6500 *//* heads: BC-30/BC-31 BC-32/BC-31 */
-    6500, 3,
+    "6500", 3,
     842, 17*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -246,7 +310,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon BJC 8200 *//* heads: BC-50 */
-    8200, 3,
+    "8200", 3,
     842, 17*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -257,6 +321,18 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL,
     NULL
   },
+  { /* Canon S500 */
+    "S500", 3,
+    842, 17*72,
+    10, 10, 15, 15,
+    &canon_default_slotlist,
+    CANON_CAP_STD0 | CANON_CAP_r | CANON_CAP_p,0x61,control_cmd_ackshort,
+    &canon_S500_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
 
 
   /* *************** */
@@ -266,7 +342,7 @@ static const canon_cap_t canon_model_capabilities[] =
   /* *************** */
 
   { /* Canon BJC 210 *//* heads: BC-02 BC-05 BC-06 */
-    210, 1,
+    "210", 1,
     618, 936,      /* 8.58" x 13 " */
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -278,7 +354,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon BJC 240 *//* heads: BC-02 BC-05 BC-06 */
-    240, 1,
+    "240", 1,
     618, 936,      /* 8.58" x 13 " */
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -290,7 +366,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon BJC 250 *//* heads: BC-02 BC-05 BC-06 */
-    250, 1,
+    "250", 1,
     618, 936,      /* 8.58" x 13 " */
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -302,7 +378,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon BJC 1000 *//* heads: BC-02 BC-05 BC-06 */
-    1000, 1,
+    "1000", 1,
     842, 17*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -314,7 +390,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon BJC 2000 *//* heads: BC-20 BC-21 BC-22 BC-29 */
-    2000, 1,
+    "2000", 1,
     842, 17*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -326,11 +402,11 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon BJC 3000 *//* heads: BC-30 BC-33 BC-34 */
-    3000, 3,
+    "3000", 3,
     842, 17*72,
-    11, 9, 10, 18,
+    10, 10, 9, 15,
     &canon_default_slotlist,
-    CANON_CAP_STD0 | CANON_CAP_a,0,NULL, /*FIX? should have _r? */
+    CANON_CAP_STD0 | CANON_CAP_a | CANON_CAP_p,0,NULL, /*FIX? should have _r? */
     &canon_BJC_3000_modelist,
     &canon_default_paperlist,
     NULL,
@@ -338,7 +414,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon BJC 6100 *//* heads: BC-30/BC-31 BC-32/BC-31 */
-    6100, 3,
+    "6100", 3,
     842, 17*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -350,7 +426,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon BJC 7000 *//* heads: BC-60/BC-61 BC-60/BC-62   ??????? */
-    7000, 3,
+    "7000", 3,
     842, 17*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -361,8 +437,20 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL,
     NULL
   },
+  { /* Canon BJC i560 */
+    "i560", 3,
+    842, 17*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD1,0,NULL,
+    &canon_BJC_i560_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
   { /* Canon BJC 7100 *//* heads: BC-60/BC-61 BC-60/BC-62   ??????? */
-    7100, 3,
+    "7100", 3,
     842, 17*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -373,6 +461,18 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL,
     NULL
   },
+  { /* Canon BJC i80 *//* heads: BC-60/BC-61 BC-60/BC-62   ??????? */
+    "i80", 3,
+    842, 17*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0,0,NULL,
+    &canon_BJC_i80_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
 
   /*****************************/
   /*                           */
@@ -382,7 +482,7 @@ static const canon_cap_t canon_model_capabilities[] =
   /*****************************/
 
   { /* Canon BJC 5100 *//* heads: BC-20 BC-21 BC-22 BC-23 BC-29 */
-    5100, 1,
+    "5100", 1,
     17*72, 22*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -394,7 +494,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon BJC 5500 *//* heads: BC-20 BC-21 BC-29 */
-    5500, 1,
+    "5500", 1,
     22*72, 34*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -406,7 +506,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon BJC 6500 *//* heads: BC-30/BC-31 BC-32/BC-31 */
-    6500, 3,
+    "6500", 3,
     17*72, 22*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -418,7 +518,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon BJC 8500 *//* heads: BC-80/BC-81 BC-82/BC-81 */
-    8500, 3,
+    "8500", 3,
     17*72, 22*72,
     11, 9, 10, 18,
     &canon_default_slotlist,
@@ -430,7 +530,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon PIXMA iP2000 */
-    9001, 3,          /*model, model_id*/
+    "PIXMA iP2000", 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,
@@ -442,7 +542,7 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon PIXMA iP3000 */
-    3999, 3,          /*model, model_id*/
+    "PIXMA iP3000", 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,
@@ -454,31 +554,67 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL
   },
   { /* Canon PIXMA iP4000 */
-    4000, 3,          /*model, model_id*/
+    "PIXMA iP4000", 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_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*/
+  { /* PIXMA MP740 (== iP4000 without duplex) */
+    "PIXMA MP740", 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_CAP_STD0|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 iP5300, MP610 */
+    "PIXMA iP5300", 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_iP5300_modelist,
     &canon_PIXMA_iP4000_paperlist,
     NULL,
     NULL,
     NULL
   },
+  { /* Canon PIXMA iP4500 */
+    "PIXMA iP4500", 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_iP5300_modelist,
+    &canon_PIXMA_iP4000_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon PIXMA iP4200 */
+    "PIXMA iP4200", 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_P,0x64,control_cmd_PIXMA_iP4200,  /*features */
+    &canon_PIXMA_iP4200_modelist,
+    &canon_PIXMA_iP4000_paperlist,
+    iP4200_lum_adjustment,
+    iP4200_hue_adjustment,
+    iP4200_sat_adjustment
+  },
   { /* Canon PIXMA iP6700 */
-    4203, 3,          /*model, model_id*/
+    "PIXMA iP6700", 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,
@@ -489,25 +625,49 @@ static const canon_cap_t canon_model_capabilities[] =
     NULL,
     NULL
   },
-  { /* Canon MULTIPASS MP150 */
-    4201, 3,          /*model, model_id*/
+  { /* Canon PIXMA iX5000 */
+    "PIXMA iX5000", 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_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x61,control_cmd_PIXMA_iP4000,  /*features */
+    &canon_PIXMA_iX5000_modelist,
     &canon_PIXMA_iP4000_paperlist,
     NULL,
     NULL,
     NULL
   },
-  { /* Canon MULTIPASS MP830 */
-    9000, 3,          /*model, model_id*/
+  { /* Canon PIXMA Pro9500 */
+    "PIXMA Pro9500", 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_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x61,control_cmd_PIXMA_iP4000,  /*features */
+    &canon_PIXMA_Pro9500_modelist,
+    &canon_PIXMA_iP4000_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon PIXMA iP8500 */
+    "PIXMA iP8500", 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_iP8500_modelist,
+    &canon_PIXMA_iP4000_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon MULTIPASS MP150 */
+    "PIXMA MP150", 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,
diff --git a/src/main/dither-impl.h b/src/main/dither-impl.h
index be17169..e297464 100644
--- a/src/main/dither-impl.h
+++ b/src/main/dither-impl.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: dither-impl.h,v 1.25 2005/04/12 00:57:01 rlk Exp $"
+ * "$Id: dither-impl.h,v 1.25.18.1 2007/12/15 20:35:44 rlk Exp $"
  *
  *   Internal implementation of dither algorithms
  *
@@ -259,5 +259,5 @@ do									\
 
 #endif /* GUTENPRINT_INTERNAL_DITHER_IMPL_H */
 /*
- * End of "$Id: dither-impl.h,v 1.25 2005/04/12 00:57:01 rlk Exp $".
+ * End of "$Id: dither-impl.h,v 1.25.18.1 2007/12/15 20:35:44 rlk Exp $".
  */
diff --git a/src/main/dither-main.c b/src/main/dither-main.c
index 759c17a..77211c3 100644
--- a/src/main/dither-main.c
+++ b/src/main/dither-main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dither-main.c,v 1.52 2006/05/28 16:59:04 rlk Exp $"
+ * "$Id: dither-main.c,v 1.52.8.1 2007/12/15 20:35:44 rlk Exp $"
  *
  *   Dither routine entrypoints
  *
diff --git a/src/main/dither-ordered.c b/src/main/dither-ordered.c
index 6a17d83..a355b41 100644
--- a/src/main/dither-ordered.c
+++ b/src/main/dither-ordered.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dither-ordered.c,v 1.17 2004/09/17 18:38:20 rleigh Exp $"
+ * "$Id: dither-ordered.c,v 1.17.18.1 2007/12/15 20:35:44 rlk Exp $"
  *
  *   Ordered dither algorithm
  *
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index 6b8fbfa..1a8cc5d 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-channels.c,v 1.62.8.2 2007/05/29 01:47:28 rlk Exp $"
+ * "$Id: escp2-channels.c,v 1.62.8.3 2007/12/29 20:42:26 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -285,352 +285,380 @@ static hue_curve_t picturemate_blue_curve =
 
 static const physical_subchannel_t standard_black_subchannels[] =
 {
-  { 0, -1, 0, "BlackDensity", NULL }
+  { 0, -1, 0, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(standard_black);
 
 static const physical_subchannel_t f360_black_subchannels[] =
 {
-  { 0, 0, 1, "BlackDensity", NULL }
+  { 0, 0, 1, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(f360_black);
 
 static const physical_subchannel_t x80_black_subchannels[] =
 {
-  { 0, -1, 48, "BlackDensity", NULL }
+  { 0, -1, 48, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(x80_black);
 
 static const physical_subchannel_t c80_black_subchannels[] =
 {
-  { 0, -1, 0, "BlackDensity", NULL }
+  { 0, -1, 0, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(c80_black);
 
+static const physical_subchannel_t c120_black_subchannels[] =
+{
+  { 0, 4, 0, 2, "BlackDensity", NULL, { 0, 0x40 } }
+};
+
+DECLARE_INK_CHANNEL(c120_black);
+
 static const physical_subchannel_t c64_black_subchannels[] =
 {
-  { 0, -1, 0, "BlackDensity", NULL }
+  { 0, -1, 0, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(c64_black);
 
 static const physical_subchannel_t standard_cyan_subchannels[] =
 {
-  { 2, -1, 0, "CyanDensity", NULL }
+  { 2, -1, 0, 0, "CyanDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(standard_cyan);
 
 static const physical_subchannel_t f360_standard_cyan_subchannels[] =
 {
-  { 2, -1, 1, "CyanDensity", NULL }
+  { 2, -1, 1, 0, "CyanDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(f360_standard_cyan);
 
 static const physical_subchannel_t r800_cyan_subchannels[] =
 {
-  { 2, -1, 1, "CyanDensity", NULL }
+  { 2, -1, 1, 0, "CyanDensity", NULL }
 };
 
 DECLARE_EXTENDED_INK_CHANNEL(r800_cyan);
 
 static const physical_subchannel_t picturemate_cyan_subchannels[] =
 {
-  { 2, -1, 0, "CyanDensity", NULL }
+  { 2, -1, 0, 0, "CyanDensity", NULL }
 };
 
 DECLARE_EXTENDED_INK_CHANNEL(picturemate_cyan);
 
 static const physical_subchannel_t cx3650_standard_cyan_subchannels[] =
 {
-  { 2, -1, 2, "CyanDensity", NULL }
+  { 2, -1, 2, 0, "CyanDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(cx3650_standard_cyan);
 
 static const physical_subchannel_t x80_cyan_subchannels[] =
 {
-  { 2, -1, 96, "CyanDensity", NULL }
+  { 2, -1, 96, 0, "CyanDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(x80_cyan);
 
 static const physical_subchannel_t c80_cyan_subchannels[] =
 {
-  { 2, -1, 0, "CyanDensity", NULL }
+  { 2, -1, 0, 0, "CyanDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(c80_cyan);
 
+static const physical_subchannel_t c120_cyan_subchannels[] =
+{
+  { 2, -1, 0, 0, "CyanDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(c120_cyan);
+
 static const physical_subchannel_t c64_cyan_subchannels[] =
 {
-  { 2, -1, 0, "CyanDensity", NULL }
+  { 2, -1, 0, 0, "CyanDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(c64_cyan);
 
 static const physical_subchannel_t standard_magenta_subchannels[] =
 {
-  { 1, -1, 0, "MagentaDensity", NULL }
+  { 1, -1, 0, 0, "MagentaDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(standard_magenta);
 
 static const physical_subchannel_t r800_magenta_subchannels[] =
 {
-  { 1, -1, 0, "MagentaDensity", NULL }
+  { 1, -1, 0, 0, "MagentaDensity", NULL }
 };
 
 DECLARE_EXTENDED_INK_CHANNEL(r800_magenta);
 
 static const physical_subchannel_t picturemate_magenta_subchannels[] =
 {
-  { 1, -1, 0, "MagentaDensity", NULL }
+  { 1, -1, 0, 0, "MagentaDensity", NULL }
 };
 
 DECLARE_EXTENDED_INK_CHANNEL(picturemate_magenta);
 
 static const physical_subchannel_t f360_standard_magenta_subchannels[] =
 {
-  { 1, -1, 1, "MagentaDensity", NULL }
+  { 1, -1, 1, 0, "MagentaDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(f360_standard_magenta);
 
 static const physical_subchannel_t x80_magenta_subchannels[] =
 {
-  { 1, -1, 48, "MagentaDensity", NULL }
+  { 1, -1, 48, 0, "MagentaDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(x80_magenta);
 
 static const physical_subchannel_t c80_magenta_subchannels[] =
 {
-  { 1, -1, 120, "MagentaDensity", NULL }
+  { 1, -1, 120, 0, "MagentaDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(c80_magenta);
 
+static const physical_subchannel_t c120_magenta_subchannels[] =
+{
+  { 1, -1, 120, 0, "MagentaDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(c120_magenta);
+
 static const physical_subchannel_t c64_magenta_subchannels[] =
 {
-  { 1, -1, 90, "MagentaDensity", NULL }
+  { 1, -1, 90, 0, "MagentaDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(c64_magenta);
 
 static const physical_subchannel_t standard_yellow_subchannels[] =
 {
-  { 4, -1, 0, "YellowDensity", NULL }
+  { 4, -1, 0, 0, "YellowDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(standard_yellow);
 
 static const physical_subchannel_t x80_yellow_subchannels[] =
 {
-  { 4, -1, 0, "YellowDensity", NULL }
+  { 4, -1, 0, 0, "YellowDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(x80_yellow);
 
 static const physical_subchannel_t c80_yellow_subchannels[] =
 {
-  { 4, -1, 240, "YellowDensity", NULL }
+  { 4, -1, 240, 0, "YellowDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(c80_yellow);
 
+static const physical_subchannel_t c120_yellow_subchannels[] =
+{
+  { 4, -1, 240, 0, "YellowDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(c120_yellow);
+
 static const physical_subchannel_t c64_yellow_subchannels[] =
 {
-  { 4, -1, 180, "YellowDensity", NULL }
+  { 4, -1, 180, 0, "YellowDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(c64_yellow);
 
 static const physical_subchannel_t f360_standard_yellow_subchannels[] =
 {
-  { 4, -1, 1, "YellowDensity", NULL }
+  { 4, -1, 1, 0, "YellowDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(f360_standard_yellow);
 
 static const physical_subchannel_t r800_yellow_subchannels[] =
 {
-  { 4, -1, 1, "YellowDensity", NULL }
+  { 4, -1, 1, 0, "YellowDensity", NULL }
 };
 
 DECLARE_EXTENDED_INK_CHANNEL(r800_yellow);
 
 static const physical_subchannel_t picturemate_yellow_subchannels[] =
 {
-  { 4, -1, 0, "YellowDensity", NULL }
+  { 4, -1, 0, 0, "YellowDensity", NULL }
 };
 
 DECLARE_EXTENDED_INK_CHANNEL(picturemate_yellow);
 
 static const physical_subchannel_t r800_red_subchannels[] =
 {
-  { 7, -1, 0, "RedDensity", NULL }
+  { 7, -1, 0, 0, "RedDensity", NULL }
 };
 
 DECLARE_EXTENDED_INK_CHANNEL(r800_red);
 
 static const physical_subchannel_t picturemate_red_subchannels[] =
 {
-  { 7, -1, 0, "RedDensity", NULL }
+  { 7, -1, 0, 0, "RedDensity", NULL }
 };
 
 DECLARE_EXTENDED_INK_CHANNEL(picturemate_red);
 
 static const physical_subchannel_t r800_blue_subchannels[] =
 {
-  { 8, -1, 1, "BlueDensity", NULL }
+  { 8, -1, 1, 0, "BlueDensity", NULL }
 };
 
 DECLARE_EXTENDED_INK_CHANNEL(r800_blue);
 
 static const physical_subchannel_t picturemate_blue_subchannels[] =
 {
-  { 8, -1, 1, "BlueDensity", NULL }
+  { 8, -1, 1, 0, "BlueDensity", NULL }
 };
 
 DECLARE_EXTENDED_INK_CHANNEL(picturemate_blue);
 
 static const physical_subchannel_t standard_gloss_subchannels[] =
 {
-  { 9, -1, 0, "GlossDensity", NULL }
+  { 9, -1, 0, 0, "GlossDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(standard_gloss);
 
 static const physical_subchannel_t f360_gloss_subchannels[] =
 {
-  { 9, -1, 1, "GlossDensity", NULL }
+  { 9, -1, 1, 0, "GlossDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(f360_gloss);
 
 static const physical_subchannel_t standard_photo_black_subchannels[] =
 {
-  { 0, 4, 0, "BlackDensity", NULL }
+  { 0, 4, 0, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(standard_photo_black);
 
 static const physical_subchannel_t f360_photo_black_subchannels[] =
 {
-  { 0, 4, 1, "BlackDensity", NULL }
+  { 0, 4, 1, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(f360_photo_black);
 
 static const physical_subchannel_t r800_matte_black_subchannels[] =
 {
-  { 0, 0, 0, "BlackDensity", NULL }
+  { 0, 0, 0, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(r800_matte_black);
 
 static const physical_subchannel_t photo_black_subchannels[] =
 {
-  { 0, 0, 0, "BlackDensity", NULL }
+  { 0, 0, 0, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(photo_black);
 
 static const physical_subchannel_t extended_black_subchannels[] =
 {
-  { 0, 1, 0, "BlackDensity", NULL }
+  { 0, 1, 0, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(extended_black);
 
 static const physical_subchannel_t f360_extended_black_subchannels[] =
 {
-  { 0, 1, 1, "BlackDensity", NULL }
+  { 0, 1, 1, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(f360_extended_black);
 
 static const physical_subchannel_t photo_cyan_subchannels[] =
 {
-  { 2, 0, 0, "CyanDensity", NULL },
-  { 2, 1, 0, "CyanDensity", "LightCyanTransition" }
+  { 2, 0, 0, 0, "CyanDensity", NULL },
+  { 2, 1, 0, 0, "CyanDensity", "LightCyanTransition" }
 };
 
 DECLARE_INK_CHANNEL(photo_cyan);
 
 static const physical_subchannel_t extended_cyan_subchannels[] =
 {
-  { 2, 1, 0, "CyanDensity", NULL }
+  { 2, 1, 0, 0, "CyanDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(extended_cyan);
 
 static const physical_subchannel_t f360_extended_cyan_subchannels[] =
 {
-  { 2, 1, 1, "CyanDensity", NULL }
+  { 2, 1, 1, 0, "CyanDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(f360_extended_cyan);
 
 static const physical_subchannel_t photo_magenta_subchannels[] =
 {
-  { 1, 0, 0, "MagentaDensity", NULL },
-  { 1, 1, 0, "MagentaDensity", "LightMagentaTransition" }
+  { 1, 0, 0, 0, "MagentaDensity", NULL },
+  { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition" }
 };
 
 DECLARE_INK_CHANNEL(photo_magenta);
 
 static const physical_subchannel_t extended_magenta_subchannels[] =
 {
-  { 1, 1, 0, "MagentaDensity", NULL }
+  { 1, 1, 0, 0, "MagentaDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(extended_magenta);
 
 static const physical_subchannel_t f360_extended_magenta_subchannels[] =
 {
-  { 1, 1, 1, "MagentaDensity", NULL }
+  { 1, 1, 1, 0, "MagentaDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(f360_extended_magenta);
 
 static const physical_subchannel_t photo_yellow_subchannels[] =
 {
-  { 4, 0, 0, "YellowDensity", NULL }
+  { 4, 0, 0, 0, "YellowDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(photo_yellow);
 
 static const physical_subchannel_t f360_photo_yellow_subchannels[] =
 {
-  { 4, 0, 1, "YellowDensity", NULL }
+  { 4, 0, 1, 0, "YellowDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(f360_photo_yellow);
 
 static const physical_subchannel_t j_extended_yellow_subchannels[] =
 {
-  { 4, 2, 0, "YellowDensity", NULL }
+  { 4, 2, 0, 0, "YellowDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(j_extended_yellow);
 
 static const physical_subchannel_t extended_photo3_black_subchannels[] =
 {
-  { 0, 3, 0, "BlackDensity", NULL }
+  { 0, 3, 0, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(extended_photo3_black);
 
 static const physical_subchannel_t f360_extended_photo3_black_subchannels[] =
 {
-  { 0, 3, 1, "BlackDensity", NULL }
+  { 0, 3, 1, 0, "BlackDensity", NULL }
 };
 
 DECLARE_INK_CHANNEL(f360_extended_photo3_black);
@@ -638,190 +666,200 @@ DECLARE_INK_CHANNEL(f360_extended_photo3_black);
 /* For Japanese 7-color printers, with dark yellow */
 static const physical_subchannel_t photo2_yellow_subchannels[] =
 {
-  { 4, 2, 0, "YellowDensity", NULL },
-  { 4, 0, 0, "YellowDensity", "DarkYellowTransition" }
+  { 4, 2, 0, 0, "YellowDensity", NULL },
+  { 4, 0, 0, 0, "YellowDensity", "DarkYellowTransition" }
 };
 
 DECLARE_INK_CHANNEL(photo2_yellow);
 
 static const physical_subchannel_t f360_photo2_yellow_subchannels[] =
 {
-  { 4, 2, 0, "YellowDensity", NULL },
-  { 4, 0, 1, "YellowDensity", "DarkYellowTransition" }
+  { 4, 2, 0, 0, "YellowDensity", NULL },
+  { 4, 0, 1, 0, "YellowDensity", "DarkYellowTransition" }
 };
 
 DECLARE_INK_CHANNEL(f360_photo2_yellow);
 
 static const physical_subchannel_t photo2_black_subchannels[] =
 {
-  { 0, 0, 0, "BlackDensity", NULL },
-  { 0, 1, 0, "BlackDensity", "GrayTransition" }
+  { 0, 0, 0, 0, "BlackDensity", NULL },
+  { 0, 1, 0, 0, "BlackDensity", "GrayTransition" }
 };
 
 DECLARE_INK_CHANNEL(photo2_black);
 
 static const physical_subchannel_t f360_photo2_black_subchannels[] =
 {
-  { 0, 0, 1, "BlackDensity", NULL },
-  { 0, 1, 0, "BlackDensity", "GrayTransition" }
+  { 0, 0, 1, 0, "BlackDensity", NULL },
+  { 0, 1, 0, 0, "BlackDensity", "GrayTransition" }
 };
 
 DECLARE_INK_CHANNEL(f360_photo2_black);
 
 static const physical_subchannel_t photo3_black_subchannels[] =
 {
-  { 0, 0, 0, "BlackDensity", NULL },
-  { 0, 1, 0, "BlackDensity", "DarkGrayTransition" },
-  { 0, 3, 0, "BlackDensity", "LightGrayTransition" }
+  { 0, 0, 0, 0, "BlackDensity", NULL },
+  { 0, 1, 0, 0, "BlackDensity", "DarkGrayTransition" },
+  { 0, 3, 0, 0, "BlackDensity", "LightGrayTransition" }
 };
 
 DECLARE_INK_CHANNEL(photo3_black);
 
 static const physical_subchannel_t f360_photo3_black_subchannels[] =
 {
-  { 0, 0, 1, "BlackDensity", NULL },
-  { 0, 1, 0, "BlackDensity", "DarkGrayTransition" },
-  { 0, 3, 1, "BlackDensity", "LightGrayTransition" }
+  { 0, 0, 1, 0, "BlackDensity", NULL },
+  { 0, 1, 0, 0, "BlackDensity", "DarkGrayTransition" },
+  { 0, 3, 1, 0, "BlackDensity", "LightGrayTransition" }
 };
 
 DECLARE_INK_CHANNEL(f360_photo3_black);
 
 static const physical_subchannel_t quadtone_subchannels[] =
 {
-  { 0, -1, 0, "BlackDensity", NULL },
-  { 2, -1, 0, "BlackDensity", "Gray3Transition" },
-  { 1, -1, 0, "BlackDensity", "Gray2Transition" },
-  { 4, -1, 0, "BlackDensity", "Gray1Transition" },
+  { 0, -1, 0, 0, "BlackDensity", NULL },
+  { 2, -1, 0, 0, "BlackDensity", "Gray3Transition" },
+  { 1, -1, 0, 0, "BlackDensity", "Gray2Transition" },
+  { 4, -1, 0, 0, "BlackDensity", "Gray1Transition" },
 };
 
 DECLARE_INK_CHANNEL(quadtone);
 
 static const physical_subchannel_t c80_quadtone_subchannels[] =
 {
-  { 0, -1, 0, "BlackDensity", NULL },
-  { 2, -1, 0, "BlackDensity", "Gray3Transition" },
-  { 1, -1, 120, "BlackDensity", "Gray2Transition" },
-  { 4, -1, 240, "BlackDensity", "Gray1Transition" },
+  { 0, -1, 0, 0, "BlackDensity", NULL },
+  { 2, -1, 0, 0, "BlackDensity", "Gray3Transition" },
+  { 1, -1, 120, 0, "BlackDensity", "Gray2Transition" },
+  { 4, -1, 240, 0, "BlackDensity", "Gray1Transition" },
 };
 
 DECLARE_INK_CHANNEL(c80_quadtone);
 
+static const physical_subchannel_t c120_quadtone_subchannels[] =
+{
+  { 0, 4, 0, 0, "BlackDensity", NULL },
+  { 2, -1, 0, 0, "BlackDensity", "Gray3Transition" },
+  { 1, -1, 120, 0, "BlackDensity", "Gray2Transition" },
+  { 4, -1, 240, 0, "BlackDensity", "Gray1Transition" },
+};
+
+DECLARE_INK_CHANNEL(c120_quadtone);
+
 static const physical_subchannel_t c64_quadtone_subchannels[] =
 {
-  { 0, -1, 0, "BlackDensity", NULL },
-  { 2, -1, 0, "BlackDensity", "Gray3Transition" },
-  { 1, -1, 90, "BlackDensity", "Gray2Transition" },
-  { 4, -1, 180, "BlackDensity", "Gray1Transition" },
+  { 0, -1, 0, 0, "BlackDensity", NULL },
+  { 2, -1, 0, 0, "BlackDensity", "Gray3Transition" },
+  { 1, -1, 90, 0, "BlackDensity", "Gray2Transition" },
+  { 4, -1, 180, 0, "BlackDensity", "Gray1Transition" },
 };
 
 DECLARE_INK_CHANNEL(c64_quadtone);
 
 static const physical_subchannel_t f360_quadtone_subchannels[] =
 {
-  { 0, -1, 0, "BlackDensity", NULL },
-  { 2, -1, 1, "BlackDensity", "Gray3Transition" },
-  { 1, -1, 1, "BlackDensity", "Gray2Transition" },
-  { 4, -1, 0, "BlackDensity", "Gray1Transition" },
+  { 0, -1, 0, 0, "BlackDensity", NULL },
+  { 2, -1, 1, 0, "BlackDensity", "Gray3Transition" },
+  { 1, -1, 1, 0, "BlackDensity", "Gray2Transition" },
+  { 4, -1, 0, 0, "BlackDensity", "Gray1Transition" },
 };
 
 DECLARE_INK_CHANNEL(f360_quadtone);
 
 static const physical_subchannel_t cx3650_quadtone_subchannels[] =
 {
-  { 0, -1, 0, "BlackDensity", NULL },
-  { 2, -1, 2, "BlackDensity", "Gray3Transition" },
-  { 1, -1, 1, "BlackDensity", "Gray2Transition" },
-  { 4, -1, 0, "BlackDensity", "Gray1Transition" },
+  { 0, -1, 0, 0, "BlackDensity", NULL },
+  { 2, -1, 2, 0, "BlackDensity", "Gray3Transition" },
+  { 1, -1, 1, 0, "BlackDensity", "Gray2Transition" },
+  { 4, -1, 0, 0, "BlackDensity", "Gray1Transition" },
 };
 
 DECLARE_INK_CHANNEL(cx3650_quadtone);
 
 static const physical_subchannel_t f360_photo_cyan_subchannels[] =
 {
-  { 2, 0, 1, "CyanDensity", NULL },
-  { 2, 1, 0, "CyanDensity", "LightCyanTransition" }
+  { 2, 0, 1, 0, "CyanDensity", NULL },
+  { 2, 1, 0, 0, "CyanDensity", "LightCyanTransition" }
 };
 
 DECLARE_INK_CHANNEL(f360_photo_cyan);
 
 static const physical_subchannel_t f360x_photo_cyan_subchannels[] =
 {
-  { 2, 0, 0, "CyanDensity", NULL },
-  { 2, 1, 1, "CyanDensity", "LightCyanTransition" }
+  { 2, 0, 0, 0, "CyanDensity", NULL },
+  { 2, 1, 1, 0, "CyanDensity", "LightCyanTransition" }
 };
 
 DECLARE_INK_CHANNEL(f360x_photo_cyan);
 
 static const physical_subchannel_t f360_photo_magenta_subchannels[] =
 {
-  { 1, 0, 1, "MagentaDensity", NULL },
-  { 1, 1, 0, "MagentaDensity", "LightMagentaTransition" }
+  { 1, 0, 1, 0, "MagentaDensity", NULL },
+  { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition" }
 };
 
 DECLARE_INK_CHANNEL(f360_photo_magenta);
 
 static const physical_subchannel_t f360x_photo_magenta_subchannels[] =
 {
-  { 1, 0, 0, "MagentaDensity", NULL },
-  { 1, 1, 1, "MagentaDensity", "LightMagentaTransition" }
+  { 1, 0, 0, 0, "MagentaDensity", NULL },
+  { 1, 1, 1, 0, "MagentaDensity", "LightMagentaTransition" }
 };
 
 DECLARE_INK_CHANNEL(f360x_photo_magenta);
 
 static const physical_subchannel_t claria_black_subchannels[] =
 {
-  { 0, 0, 0, "BlackDensity", NULL },
+  { 0, 0, 0, 0, "BlackDensity", NULL },
 };
 
 DECLARE_INK_CHANNEL(claria_black);
 
 static const physical_subchannel_t claria_yellow_subchannels[] =
 {
-  { 4, 0, 2, "YellowDensity", NULL },
+  { 4, 0, 2, 0, "YellowDensity", NULL },
 };
 
 DECLARE_INK_CHANNEL(claria_yellow);
 
 static const physical_subchannel_t claria_cyan_subchannels[] =
 {
-  { 2, 0, 0, "CyanDensity", NULL },
+  { 2, 0, 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" },
+  { 2, 0, 0, 0, "CyanDensity", NULL },
+  { 2, 1, 2, 0, "CyanDensity", "LightCyanTransition" },
 };
 
 DECLARE_INK_CHANNEL(claria_photo_cyan);
 
 static const physical_subchannel_t extended_claria_cyan_subchannels[] =
 {
-  { 2, 1, 2, "CyanDensity", "LightCyanTransition" },
+  { 2, 1, 2, 0, "CyanDensity", "LightCyanTransition" },
 };
 
 DECLARE_INK_CHANNEL(extended_claria_cyan);
 
 static const physical_subchannel_t claria_magenta_subchannels[] =
 {
-  { 1, 0, 2, "MagentaDensity", NULL },
+  { 1, 0, 2, 0, "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" },
+  { 1, 0, 2, 0, "MagentaDensity", NULL },
+  { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition" },
 };
 
 DECLARE_INK_CHANNEL(claria_photo_magenta);
 
 static const physical_subchannel_t extended_claria_magenta_subchannels[] =
 {
-  { 1, 1, 0, "MagentaDensity", "LightMagentaTransition" },
+  { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition" },
 };
 
 DECLARE_INK_CHANNEL(extended_claria_magenta);
@@ -1011,6 +1049,19 @@ static const escp2_inkname_t c80_generic_quadtone_inkset =
   &c80_quadtone_channel_set
 };
 
+static const ink_channel_t *const c120_quadtone_channels[] =
+{
+  &c120_quadtone_channel
+};
+
+DECLARE_CHANNEL_SET(c120_quadtone);
+
+static const escp2_inkname_t c120_generic_quadtone_inkset =
+{
+  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
+  &c120_quadtone_channel_set
+};
+
 static const ink_channel_t *const c64_quadtone_channels[] =
 {
   &c64_quadtone_channel
@@ -1102,6 +1153,20 @@ static const escp2_inkname_t c80_three_color_composite_inkset =
   &c80_cmy_channel_set
 };
 
+static const ink_channel_t *const c120_cmy_channels[] =
+{
+  NULL, &c120_cyan_channel,
+  &c120_magenta_channel, &c120_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(c120_cmy);
+
+static const escp2_inkname_t c120_three_color_composite_inkset =
+{
+  "RGB", N_("Three Color Composite"), INKSET_CMYK,
+  &c120_cmy_channel_set
+};
+
 static const ink_channel_t *const c64_cmy_channels[] =
 {
   NULL, &c64_cyan_channel,
@@ -1318,6 +1383,20 @@ static const escp2_inkname_t c80_four_color_standard_inkset =
   &c80_cmyk_channel_set
 };
 
+static const ink_channel_t *const c120_cmyk_channels[] =
+{
+  &c120_black_channel, &c120_cyan_channel,
+  &c120_magenta_channel, &c120_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(c120_cmyk);
+
+static const escp2_inkname_t c120_four_color_standard_inkset =
+{
+  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
+  &c120_cmyk_channel_set
+};
+
 static const ink_channel_t *const c64_cmyk_channels[] =
 {
   &c64_black_channel, &c64_cyan_channel,
@@ -1798,6 +1877,18 @@ static const escp2_inkname_t one_color_extended_inkset =
   &one_color_extended_channel_set
 };
 
+static const ink_channel_t *const c120_one_color_extended_channels[] =
+{
+  &c120_black_channel
+};
+DECLARE_CHANNEL_SET(c120_one_color_extended);
+
+static const escp2_inkname_t c120_one_color_extended_inkset =
+{
+  "PhysicalBlack", N_("One Color Raw"), INKSET_EXTENDED,
+  &c120_one_color_extended_channel_set
+};
+
 static const escp2_inkname_t one_color_photo_extended_inkset =
 {
   "PhysicalBlack", N_("One Color Raw"), INKSET_EXTENDED,
@@ -1903,6 +1994,19 @@ static const escp2_inkname_t c80_three_color_extended_inkset =
   &c80_three_color_extended_channel_set
 };
 
+static const ink_channel_t *const c120_three_color_extended_channels[] =
+{
+  &c120_cyan_channel, &c120_magenta_channel, &c120_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(c120_three_color_extended);
+
+static const escp2_inkname_t c120_three_color_extended_inkset =
+{
+  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
+  &c120_three_color_extended_channel_set
+};
+
 static const ink_channel_t *const c64_three_color_extended_channels[] =
 {
   &c64_cyan_channel, &c64_magenta_channel, &c64_yellow_channel
@@ -1982,6 +2086,12 @@ static const escp2_inkname_t c80_four_color_extended_inkset =
   &c80_cmyk_channel_set
 };
 
+static const escp2_inkname_t c120_four_color_extended_inkset =
+{
+  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
+  &c120_cmyk_channel_set
+};
+
 static const escp2_inkname_t c64_four_color_extended_inkset =
 {
   "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
@@ -2418,6 +2528,26 @@ static const escp2_inkname_t *const c80_quadtone_ink_types[] =
 DECLARE_INKLIST("Quadtone", c80_quadtone, c80_quadtone, N_("Quadtone"),
 		standard, standard, quadtone);
 
+static const escp2_inkname_t *const c120_ink_types[] =
+{
+  &c120_four_color_standard_inkset,
+  &c120_three_color_composite_inkset,
+  &c120_one_color_extended_inkset,
+  &c120_three_color_extended_inkset,
+  &c120_four_color_extended_inkset,
+};
+
+DECLARE_INKLIST("None", c120, c120, N_("EPSON Standard Inks"),
+		durabrite2, durabrite3, standard);
+
+static const escp2_inkname_t *const c120_quadtone_ink_types[] =
+{
+  &c120_generic_quadtone_inkset,
+};
+
+DECLARE_INKLIST("Quadtone", c120_quadtone, c120_quadtone, N_("Quadtone"),
+		standard, standard, quadtone);
+
 static const escp2_inkname_t *const c64_ink_types[] =
 {
   &c64_four_color_standard_inkset,
@@ -2706,6 +2836,14 @@ static const inklist_t *const c80_group[] =
 
 DECLARE_INKGROUP(c80);
 
+static const inklist_t *const c120_group[] =
+{
+  &c120_inklist,
+  &c120_quadtone_inklist
+};
+
+DECLARE_INKGROUP(c120);
+
 static const inklist_t *const c82_group[] =
 {
   &c82_inklist,
@@ -2854,6 +2992,7 @@ static const ink_t the_inks[] =
 {
   { "cmy", &cmy_inkgroup },
   { "standard", &standard_inkgroup },
+  { "c120", &c120_inkgroup },
   { "c80", &c80_inkgroup },
   { "c82", &c82_inkgroup },
   { "c64", &c64_inkgroup },
@@ -2913,6 +3052,17 @@ static const char *standard_channel_names[] =
 
 DECLARE_CHANNEL_LIST(standard);
 
+static const char *c120_channel_names[] =
+{
+  N_("Black"),
+  N_("Black"),
+  N_("Magenta"),
+  N_("Cyan"),
+  N_("Yellow")
+};
+
+DECLARE_CHANNEL_LIST(c120);
+
 static const char *cx3800_channel_names[] =
 {
   N_("Cyan"),
@@ -2957,6 +3107,18 @@ static const char *rx700_channel_names[] =
 
 DECLARE_CHANNEL_LIST(rx700);
 
+static const char *sp1400_channel_names[] =
+{
+  N_("Yellow"),
+  N_("Black"),
+  N_("Light Cyan"),
+  N_("Light Magenta"),
+  N_("Magenta"),
+  N_("Cyan"),
+};
+
+DECLARE_CHANNEL_LIST(sp1400);
+
 static const char *sp2200_channel_names[] =
 {
   N_("Black"),
@@ -3050,11 +3212,13 @@ static const channel_t the_channels[] =
   { "picturemate", &picturemate_channel_name_list },
   { "pm_950c", &pm_950c_channel_name_list },
   { "r2400", &r2400_channel_name_list },
+  { "sp1400", &sp1400_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 },
+  { "c120", &c120_channel_name_list },
 };
 
 const channel_name_t *
diff --git a/src/main/escp2-driver.c b/src/main/escp2-driver.c
index 2141cfc..4e0ecbd 100644
--- a/src/main/escp2-driver.c
+++ b/src/main/escp2-driver.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-driver.c,v 1.30.6.1 2007/03/02 12:01:25 rlk Exp $"
+ * "$Id: escp2-driver.c,v 1.30.6.3 2007/12/30 05:37:55 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -430,6 +430,9 @@ escp2_set_printhead_resolution(stp_vars_t *v)
 
       if (pd->command_set == MODEL_COMMAND_PRO && !pd->res->softweave)
 	yres = yres /  pd->res->vres;
+      else if (pd->split_channel_count > 1)
+	yres = yres * pd->nozzle_separation / pd->base_separation *
+	  pd->split_channel_count;
       else
 	yres = yres * pd->nozzle_separation / pd->base_separation;
 
@@ -496,18 +499,14 @@ set_horizontal_position(stp_vars_t *v, stp_pass_t *pass, int vertical_subpass)
 }
 
 static void
-send_print_command(stp_vars_t *v, stp_pass_t *pass, int color, int nlines)
+send_print_command(stp_vars_t *v, stp_pass_t *pass, int ncolor, int nlines)
 {
   escp2_privdata_t *pd = get_privdata(v);
   int lwidth = (pd->image_printed_width + (pd->horizontal_passes - 1)) /
     pd->horizontal_passes;
   if (pd->command_set == MODEL_COMMAND_PRO || pd->variable_dots)
     {
-      int ncolor = pd->channels[color]->color;
-      int subchannel = pd->channels[color]->subchannel;
       int nwidth = pd->bitwidth * ((lwidth + 7) / 8);
-      if (subchannel >= 0)
-	ncolor |= (subchannel << 4);
       stp_send_command(v, "\033i", "ccchh", ncolor, COMPRESSION,
 		       pd->bitwidth, nwidth, nlines);
     }
@@ -537,7 +536,7 @@ send_extra_data(stp_vars_t *v, int extralines)
   escp2_privdata_t *pd = get_privdata(v);
   int lwidth = (pd->image_printed_width + (pd->horizontal_passes - 1)) /
     pd->horizontal_passes;
-#if TEST_UNCOMPRESSED
+#ifdef TEST_UNCOMPRESSED
   int i;
   for (i = 0; i < pd->bitwidth * (lwidth + 7) / 8; i++)
     stp_putc(0, v);
@@ -626,31 +625,78 @@ stpi_escp2_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
 
   for (j = 0; j < pd->channels_in_use; j++)
     {
-      if (lineactive[0].v[j] > 0)
+      if (lineactive->v[j] > 0)
 	{
-	  int nlines = linecount[0].v[j];
+	  int ncolor = pd->channels[j]->color;
+	  int subchannel = pd->channels[j]->subchannel;
+	  int nlines = linecount->v[j];
 	  int extralines = 0;
-	  if (nlines < minlines)
-	    {
-	      extralines = minlines - nlines;
-	      nlines = minlines;
-	    }
 	  set_vertical_position(v, pass);
 	  set_color(v, pass, j);
-	  set_horizontal_position(v, pass, vertical_subpass);
-	  send_print_command(v, pass, j, nlines);
-
-	  /*
-	   * Send the data
-	   */
-	  stp_zfwrite((const char *)bufs[0].v[j], lineoffs[0].v[j], 1, v);
-	  if (extralines)
-	    send_extra_data(v, extralines);
-	  stp_send_command(v, "\r", "");
+	  if (subchannel >= 0)
+	    ncolor |= (subchannel << 4);
+
+	  if (pd->split_channels)
+	    {
+	      int sc = pd->split_channel_count;
+	      int k, l;
+	      for (k = 0; k < sc; k++)
+		{
+		  int lc = ((nlines + (sc - k - 1)) / sc);
+		  if (lc < minlines)
+		    {
+		      extralines = minlines - lc;
+		    }
+		  if (lc + extralines > 0)
+		    {
+		      set_horizontal_position(v, pass, vertical_subpass);
+		      send_print_command(v, pass, pd->split_channels[k],
+					 lc + extralines);
+		      for (l = 0; l < lc; l++)
+			{
+			  int sp = (l * sc) + k;
+			  unsigned long offset = sp * pd->split_channel_width;
+			  if (COMPRESSION)
+			    {
+			      unsigned char *comp_ptr;
+			      stp_pack_tiff(v, bufs->v[j] + offset,
+					    pd->split_channel_width,
+					    pd->comp_buf, &comp_ptr, NULL, NULL);
+			      stp_zfwrite((const char *) pd->comp_buf,
+					  comp_ptr - pd->comp_buf, 1, v);
+			    }
+			  else
+			    stp_zfwrite((const char *) bufs->v[j] + offset,
+					pd->split_channel_width, 1, v);
+			}
+		      if (extralines)
+			send_extra_data(v, extralines);
+		      stp_send_command(v, "\r", "");
+		    }
+		}
+	    }
+	  else
+	    {
+	      set_horizontal_position(v, pass, vertical_subpass);
+	      if (nlines < minlines)
+		{
+		  extralines = minlines - nlines;
+		  nlines = minlines;
+		}
+	      send_print_command(v, pass, ncolor, nlines);
+
+	      /*
+	       * Send the data
+	       */
+	      stp_zfwrite((const char *)bufs->v[j], lineoffs->v[j], 1, v);
+	      if (extralines)
+		send_extra_data(v, extralines);
+	      stp_send_command(v, "\r", "");
+	    }
 	  pd->printed_something = 1;
 	}
-      lineoffs[0].v[j] = 0;
-      linecount[0].v[j] = 0;
+      lineoffs->v[j] = 0;
+      linecount->v[j] = 0;
     }
 }
 
diff --git a/src/main/escp2-inks.c b/src/main/escp2-inks.c
index 309a40e..e3d93a6 100644
--- a/src/main/escp2-inks.c
+++ b/src/main/escp2-inks.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-inks.c,v 1.46.10.2 2007/05/29 01:47:28 rlk Exp $"
+ * "$Id: escp2-inks.c,v 1.46.10.3 2007/12/29 20:42:26 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -235,6 +235,20 @@ static const escp2_dropsize_t escp2_3pl_pigment_c66_2880_dropsizes =
 static const escp2_dropsize_t escp2_3pl_pigment_c66_5760_dropsizes =
   { "3pl_pigment_c66_5760", 1, { 1.0 } };
 
+/* Stylus C120 */
+static const escp2_dropsize_t escp2_low_pigment_c120_dropsizes =
+  { "low_pigment_c120", 3, { 0.25, 0.5, 1.0 } };
+static const escp2_dropsize_t escp2_6pl_pigment_c120_dropsizes =
+  { "6pl_pigment_c120", 3, { 0.12, 0.3, 1.0 } };
+/*  { "6pl_pigment_c120", 3, { 0.15, 0.3, 1.0 } }; */
+/*  { "6pl_pigment_c120", 3, { 0.18, 0.333, 1.0 } }; */
+static const escp2_dropsize_t escp2_3pl_pigment_c120_dropsizes =
+  { "3pl_pigment_c120", 3, { 0.25, 0.5, 1.0 } };
+static const escp2_dropsize_t escp2_3pl_pigment_c120_2880_dropsizes =
+  { "3pl_pigment_c120_2880", 2, { 0.5, 1.0 } };
+static const escp2_dropsize_t escp2_3pl_pigment_c120_5760_dropsizes =
+  { "3pl_pigment_c120_5760", 1, { 1.0 } };
+
 /* Stylus Photo 2000P */
 static const escp2_dropsize_t escp2_2000p_dropsizes =
   { "2000p", 2, { 0.55, 1.0 } };
@@ -472,6 +486,19 @@ static const escp2_drop_list_t variable_3pl_pigment_c66_drops =
   &escp2_3pl_pigment_c66_5760_dropsizes,
 };
 
+static const escp2_drop_list_t variable_3pl_pigment_c120_drops =
+{
+  &escp2_low_pigment_c120_dropsizes,
+  &escp2_low_pigment_c120_dropsizes,
+  &escp2_6pl_pigment_c120_dropsizes,
+  &escp2_6pl_pigment_c120_dropsizes,
+  &escp2_3pl_pigment_c120_dropsizes,
+  &escp2_3pl_pigment_c120_2880_dropsizes,
+  &escp2_3pl_pigment_c120_5760_dropsizes,
+  &escp2_3pl_pigment_c120_5760_dropsizes,
+  &escp2_3pl_pigment_c120_5760_dropsizes,
+};
+
 static const escp2_drop_list_t spro10000_drops =
 {
   &escp2_spro10000_dropsizes,
@@ -501,6 +528,7 @@ static const drop_list_t the_drop_lists[] =
   { "variable_3pl", &variable_3pl_drops },
   { "variable_3pl_pigment", &variable_3pl_pigment_drops },
   { "variable_3pl_pigment_c66", &variable_3pl_pigment_c66_drops },
+  { "variable_3pl_pigment_c120", &variable_3pl_pigment_c120_drops },
   { "variable_3pl_pmg", &variable_3pl_pmg_drops },
   { "variable_claria", &claria_drops },
   { "variable_claria_1400", &claria_1400_drops },
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
index 03f9edc..1cdc837 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-papers.c,v 1.99.8.2 2007/05/29 01:47:28 rlk Exp $"
+ * "$Id: escp2-papers.c,v 1.99.8.3 2007/12/29 20:42:26 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -578,6 +578,52 @@ static const char r800_glossy_hue_adj[] =
 "</curve>\n"
 "</gutenprint>\n";
 
+static const char durabrite3_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.20 1.20 1.30 1.50 1.70 1.90 2.00 2.00 "  /* B */
+/* B */  "2.00 2.00 2.00 2.00 2.00 2.00 2.00 2.00 "  /* M */
+/* M */  "2.00 1.80 1.60 1.40 1.20 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.15 1.40 1.70 2.00 2.30 2.40 2.40 "  /* G */
+/* G */  "2.40 2.40 2.40 2.30 2.00 1.70 1.40 1.15 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char durabrite3_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.63 0.64 0.66 0.69 0.73 0.78 0.82 0.85 "  /* B */
+/* B */  "0.85 0.82 0.78 0.78 0.79 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 1.00 0.99 0.98 0.97 0.95 0.93 "  /* G */
+/* G */  "0.90 0.76 0.68 0.65 0.64 0.63 0.63 0.63 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char durabrite3_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 0.00 0.00 -.02 -.04 -.08 -.12 -.16 "  /* B */
+/* B */  "-.20 -.24 -.28 -.32 -.36 -.37 -.38 -.39 "  /* M */
+/* M */  "-.40 -.45 -.50 -.52 -.52 -.50 -.45 -.40 "  /* R */
+/* R */  "-.35 -.27 -.15 -.06 0.00 0.00 0.00 0.00 "  /* Y */
+/* Y */  "0.00 -.00 -.03 -.06 -.09 -.13 -.17 -.21 "  /* G */
+/* G */  "-.25 -.22 -.19 -.16 -.13 -.10 -.07 -.03 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+
 #define DECLARE_PAPERS(name)			\
 static const paperlist_t name##_paper_list =	\
 {						\
@@ -1246,6 +1292,50 @@ static const paper_adjustment_t durabrite2_adjustments[] =
 
 DECLARE_PAPER_ADJUSTMENTS(durabrite2);
 
+static const paper_adjustment_t durabrite3_adjustments[] =
+{
+  { "Plain", 0.72, .5, .75, .05, .9, 1, 1, 1, 1, 1, 1.0,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "PlainFast", 0.72, .75, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "Postcard", 0.72, .75, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "GlossyFilm", 0.83, 1.0, 1, .05, .999, 1, 1, 1, 1, 1, 1,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "Transparency", 0.83, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "Envelope", 0.72, .75, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "BackFilm", 0.83, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "Matte", 0.92, .5, .85, .075, .999, 1, .975, .975, 1, 1, 1.0,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "MatteHeavy", 0.92, .85, .5, .075, .999, 1, .975, .975, 1, 1, 1.0,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "Inkjet", 0.72, .5, .85, .05, .9, 1, 1, 1, 1, 1, 1.0,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "Coated", 0.83, .5, .85, .075, .999, 1, 1, 1, 1, 1, 1.0,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "Photo", 1.0, .5, .85, .075, .999, 1, .8, .8, 1, 1, 1,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "GlossyPhoto", 1.0, 1.0, 1, .15, .999, 1, .8, .8, 1, 1, 1.0,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "Semigloss", 1.0, 1.0, 1, .15, .999, 1, .8, .8, 1, 1, .92,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "Luster", 1.0, 1.0, 1, .15, .999, 1, .8, .8, 1, 1, .92,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "GlossyPaper", .83, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1.0,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "Ilford", .83, 1.0, 1, .15, 1.35, 1, 1, 1, 1, 1, 1,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj  },
+  { "ColorLife", .83, 1.0, 1, .15, .9, 1, 1, 1, 1, 1, 1,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+  { "Other", 0.72, .5, .75, .05, .9, 1, 1, 1, 1, 1, 1,
+    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
+};
+
+DECLARE_PAPER_ADJUSTMENTS(durabrite3);
+
 static const paper_t standard_papers[] =
 {
   { "Plain", N_("Plain Paper"), PAPER_PLAIN,
@@ -1573,6 +1663,7 @@ static const paperadj_t the_adjustments[] =
   { "standard", &standard_paper_adjustment_list },
   { "durabrite", &durabrite_paper_adjustment_list },
   { "durabrite2", &durabrite2_paper_adjustment_list },
+  { "durabrite3", &durabrite3_paper_adjustment_list },
   { "photo", &photo_paper_adjustment_list },
   { "photo2", &photo2_paper_adjustment_list },
   { "photo3", &photo3_paper_adjustment_list },
diff --git a/src/main/escp2-resolutions.c b/src/main/escp2-resolutions.c
index 22db6c7..17a480a 100644
--- a/src/main/escp2-resolutions.c
+++ b/src/main/escp2-resolutions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-resolutions.c,v 1.33.8.2 2007/05/29 01:47:28 rlk Exp $"
+ * "$Id: escp2-resolutions.c,v 1.33.8.3 2007/12/15 20:35:44 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -641,8 +641,8 @@ static const quality_t standard_qualities[] =
   { "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 },
+  { "UltraPhoto",  N_("Ultra Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
+  { "Best",        N_("Best"),         720, 360, 0, 1440, -1, -1 },
 };
 
 DECLARE_QUALITY_LIST(standard);
@@ -656,8 +656,8 @@ static const quality_t p1_5_qualities[] =
   { "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 },
+  { "UltraPhoto",  N_("Ultra Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
+  { "Best",        N_("Best"),         720, 360, 0, 1440, -1, -1 },
 };
 
 DECLARE_QUALITY_LIST(p1_5);
diff --git a/src/main/gutenprint.pc.in b/src/main/gutenprint.pc.in
index b7ad498..850b81a 100644
--- a/src/main/gutenprint.pc.in
+++ b/src/main/gutenprint.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: Gutenprint
 Description: Gutenprint Top Quality Printer Drivers
-Version: @gutenprint_version@
+Version: @GUTENPRINT_VERSION@
 Libs: -L${libdir} @GUTENPRINT_LIBS@
 Libs.private: @gutenprint_libdeps@
 Cflags: -I${includedir} @gutenprint_cflags@
diff --git a/src/main/papers.xml b/src/main/papers.xml
index c8a017b..97b6a40 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.8.1 2007/03/02 12:01:26 rlk Exp $"
+   "$Id: papers.xml,v 1.21.8.2 2007/12/15 20:35:44 rlk Exp $"
 -->
 
 <!--
@@ -71,8 +71,8 @@
     <paper name="CDCustom">
       <description value="CD - Custom"/>
       <comment value="CD, custom diameter"/>
-      <width value="337"/>
-      <height value="337"/>
+      <width value="340"/>
+      <height value="340"/>
       <unit value="english"/>
     </paper>
     <paper name="w216h360">
diff --git a/src/main/print-canon.c b/src/main/print-canon.c
index 06e3b49..5df9c9f 100644
--- a/src/main/print-canon.c
+++ b/src/main/print-canon.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-canon.c,v 1.190.2.3 2007/05/29 01:47:28 rlk Exp $"
+ * "$Id: print-canon.c,v 1.190.2.5 2007/12/29 20:42:27 rlk Exp $"
  *
  *   Print plug-in CANON BJL driver for the GIMP.
  *
@@ -121,6 +121,7 @@ pack_pixels(unsigned char* buf,int len)
 #define CANON_CAP_px        0x2000ul
 #define CANON_CAP_rr        0x4000ul
 #define CANON_CAP_I         0x8000ul
+#define CANON_CAP_P         0x20000ul
 #define CANON_CAP_DUPLEX    0x40000ul
 
 #define CANON_CAP_STD0 (CANON_CAP_b|CANON_CAP_c|CANON_CAP_d|\
@@ -153,6 +154,7 @@ typedef struct
   const canon_paper_t *pt;
   unsigned int used_inks;
   int num_channels;
+  int quality;
   canon_channel_t* channels;
   char* channel_order;
   const canon_cap_t *caps;
@@ -381,16 +383,55 @@ get_media_type(const canon_cap_t* caps,const char *name)
 }
 
 
-static const canon_cap_t * canon_get_model_capabilities(int model)
+static const char* canon_families[] = {
+ "", /* the old BJC printers */
+ "S",
+ "i",
+ "PIXMA iP",
+ "PIXMA iX",
+ "PIXMA MP",
+ "PIXUS",
+ "PIXMA Pro"
+};
+
+/* canon model ids look like the following
+   FFMMMMMM
+   FF: family is the offset in the canon_families struct
+   MMMMMM: model nr
+*/
+static char* canon_get_printername(const stp_vars_t* v)
+{
+  unsigned int model = stp_get_model_id(v);
+  unsigned int family = model / 1000000; 
+  unsigned int nr = model - family * 1000000;
+  char* name;
+  size_t len;
+  if(family >= sizeof(canon_families) / sizeof(canon_families[0])){
+    stp_erprintf("canon_get_printername: no family %i using default BJC\n", family);
+    family = 0;
+  }
+  len = strlen(canon_families[family]) + 7; /* max model nr. + terminating 0 */
+  name = stp_zalloc(len);
+  snprintf(name,len,"%s%u",canon_families[family],nr);
+  return name;
+}
+
+
+
+
+static const canon_cap_t * canon_get_model_capabilities(const stp_vars_t*v)
 {
   int i;
+  char* name = canon_get_printername(v);
   int models= sizeof(canon_model_capabilities) / sizeof(canon_cap_t);
   for (i=0; i<models; i++) {
-    if (canon_model_capabilities[i].model == model) {
+    if (!strcmp(canon_model_capabilities[i].name,name)) {
+      stp_free(name);
       return &(canon_model_capabilities[i]);
     }
   }
-  stp_deprintf(STP_DBG_CANON,"canon: model %d not found in capabilities list.\n",model);
+  stp_erprintf("canon: model %s not found in capabilities list=> using default\n",name);
+  stp_free(name);
   return &(canon_model_capabilities[0]);
 }
 
@@ -413,7 +454,7 @@ canon_source_type(const char *name, const canon_cap_t * caps)
 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_cap_t * caps = canon_get_model_capabilities(v);
     const canon_mode_t* mode = NULL;
     int i;
     if(resolution){
@@ -544,7 +585,7 @@ canon_parameters(const stp_vars_t *v, const char *name,
   int		i;
 
   const canon_cap_t * caps=
-    canon_get_model_capabilities(stp_get_model_id(v));
+    canon_get_model_capabilities(v);
   description->p_type = STP_PARAMETER_TYPE_INVALID;
 
   if (name == NULL)
@@ -787,7 +828,7 @@ internal_imageable_area(const stp_vars_t *v,   /* I */
   int top_margin = 0;
   int cd = 0;
 
-  const canon_cap_t * caps= canon_get_model_capabilities(stp_get_model_id(v));
+  const canon_cap_t * caps= canon_get_model_capabilities(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");
@@ -838,7 +879,7 @@ canon_limit(const stp_vars_t *v,  		/* I */
 	    int *min_height)
 {
   const canon_cap_t * caps=
-    canon_get_model_capabilities(stp_get_model_id(v));
+    canon_get_model_capabilities(v);
   *width =	caps->max_width;
   *height =	caps->max_height;
   *min_width = 1;
@@ -987,7 +1028,7 @@ canon_init_setColor(const stp_vars_t *v, const canon_privdata_t *init)
 
                   arg_63[1] = (init->pt) ? init->pt->media_code_c : 0;                /* print media type */
 
-                 if (init->caps->model == 4202) /* S200 */
+                 if (!strcmp(init->caps->name,"S200")) /* S200 */
                    {
                      if ((init->mode->xdpi == 720) && (init->mode->ydpi == 720 ))
                        arg_63[2] = 1;
@@ -1004,7 +1045,7 @@ canon_init_setColor(const stp_vars_t *v, const canon_privdata_t *init)
                        }
                    }
                  else
-                   arg_63[2] = 2;        /* hardcode to whatever this means for now; quality, apparently */
+                   arg_63[2] = init->quality;        /* hardcode to whatever this means for now; quality, apparently */
 
                  stp_zprintf(v, "\033\050\143");
                  stp_put16_le(numargs, v);
@@ -1023,7 +1064,7 @@ 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->mode->xdpi <= 360))
+   if (strcmp(init->caps->name,"S200") || (init->mode->xdpi <= 360))
   canon_cmd(v,ESC28,0x64, 4,
 	    (init->mode->ydpi >> 8 ), (init->mode->ydpi & 255),
 	    (init->mode->xdpi >> 8 ), (init->mode->xdpi & 255));
@@ -1109,19 +1150,19 @@ canon_init_setPrintMode(const stp_vars_t *v, const canon_privdata_t *init)
     arg_6d_b= 1;
 
     arg_6d_1= 0x04;
-  if ((init->caps->model==7000) && (init->used_inks == CANON_INK_K || init->used_inks == CANON_INK_CcMmYK || init->used_inks == CANON_INK_CcMmYyK))
+  if ((!strcmp(init->caps->name,"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)
+  if (((!strcmp(init->caps->name,"8200") || !strcmp(init->caps->name,"S200")) && 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)
+  if(!strcmp(init->caps->name,"S200") && 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)
+  if (!strcmp(init->caps->name,"8200") || !strcmp(init->caps->name,"S200"))
     arg_6d_3= 0x01;
 
   canon_cmd(v,ESC28,0x6d,12, arg_6d_1,
@@ -1138,8 +1179,8 @@ canon_init_setPageMargins2(const stp_vars_t *v, const canon_privdata_t *init)
    * 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;
+  int printable_width=  (init->page_width + 1)*5/6;
+  int printable_length= (init->page_height + 1)*5/6;
 
   unsigned char arg_70_1= (printable_length >> 8) & 0xff;
   unsigned char arg_70_2= (printable_length) & 0xff;
@@ -1152,7 +1193,7 @@ canon_init_setPageMargins2(const stp_vars_t *v, const canon_privdata_t *init)
 
   if ((init->caps->features & CANON_CAP_px) && !(input_slot && !strcmp(input_slot,"CD")))
   {
-    unsigned int unit = init->mode->xdpi;
+    unsigned int unit = 600;
     stp_zfwrite(ESC28,2,1,v); /* ESC( */
     stp_putc(0x70,v);         /* p    */
     stp_put16_le(46, v);      /* len  */
@@ -1179,6 +1220,16 @@ canon_init_setPageMargins2(const stp_vars_t *v, const canon_privdata_t *init)
 	      arg_70_3, arg_70_4, 0x00, 0x00);
 }
 
+/* ESC (P -- 0x50 -- unknown -- :
+ */
+static void
+canon_init_setESC_P(const stp_vars_t *v, const canon_privdata_t *init)
+{
+	if(!(init->caps->features & CANON_CAP_P))
+		return;
+	canon_cmd( v,ESC28,0x50,4,0x00,0x03,0x00,0x00 );
+}
+
 /* ESC (q -- 0x71 -- setPageID -- :
  */
 static void
@@ -1234,8 +1285,16 @@ canon_init_setImage(const stp_vars_t *v, const canon_privdata_t *init)
     int length = init->mode->num_inks*3 + 3;
     unsigned char* buf = stp_zalloc(length);
     buf[0]=0x80;
-    buf[1]=0x80;
-    buf[2]=0x01;
+    if(init->mode->flags & MODE_FLAG_PRO){
+    	buf[1]=0x10;
+    	buf[2]=0x4;
+    }else if(init->mode->flags & MODE_FLAG_IP8500){
+    	buf[1]=0x00;
+    	buf[2]=0x01;
+    }else{
+    	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)
@@ -1254,7 +1313,7 @@ canon_init_setImage(const stp_vars_t *v, const canon_privdata_t *init)
   }
 
   /* other models mostly hardcoded stuff not really understood ;( */
-  if (init->caps->model==4202) /* 1 bit per pixel (arg 4,7,10,13); */
+  if (!strcmp(init->caps->name,"S200")) /* 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 */
                                /* the windows driver works */
@@ -1275,7 +1334,7 @@ canon_init_setImage(const stp_vars_t *v, const canon_privdata_t *init)
   }
 
   /* workaround for the bjc8200 in 6color mode - not really understood */
-  if (init->caps->model==8200) {
+  if (!strcmp(init->caps->name,"8200")) {
     if (init->used_inks == CANON_INK_CcMmYK) {
       arg_74_1= 0xff;
       arg_74_2= 0x90;
@@ -1330,6 +1389,7 @@ canon_init_printer(const stp_vars_t *v, const canon_privdata_t *init)
   canon_init_setColor(v,init);           /* ESC (c */
   canon_init_setPageMargins(v,init);     /* ESC (g */
   canon_init_setPageMargins2(v,init);    /* ESC (p */
+  canon_init_setESC_P(v,init);           /* ESD (P */
   canon_init_setTray(v,init);            /* ESC (l */
   canon_init_setX72(v,init);             /* ESC (r */
   canon_init_setMultiRaster(v,init);     /* ESC (I (J (L */
@@ -1632,14 +1692,60 @@ static void setup_page(stp_vars_t* v,canon_privdata_t* privdata){
 }
 
 
+/* combine all curve parameters in s and apply them */
+static void canon_set_curve_parameter(stp_vars_t *v,const char* type,stp_curve_compose_t comp,const char* s1,const char* s2,const char* s3){
+  const char * s[3];
+  size_t count = sizeof(s) / sizeof(s[0]); 
+  stp_curve_t *ret = NULL;
+  int curve_count = 0;
+  int i;
+  const size_t piecewise_point_count = 384;
 
 
+  /* ignore settings from the printercaps if the user specified his own parameters */
+  if(stp_check_curve_parameter(v,type, STP_PARAMETER_ACTIVE))
+    return;
 
+  /* init parameter list (FIXME pass array directly???)*/
+  s[0] = s1;
+  s[1] = s2;
+  s[2] = s3;
 
+  /* skip empty curves */
+  for(i=0;i<count;i++){
+    if(s[i])
+      s[curve_count++] = s[i];
+  }
 
+  /* combine curves */
+  if(curve_count){
+    for(i=0;i<curve_count;i++){
+      stp_curve_t* t_tmp = stp_curve_create_from_string(s[i]);
+      if(t_tmp){
+        if(stp_curve_is_piecewise(t_tmp)){
+          stp_curve_resample(t_tmp, piecewise_point_count);
+        }
+        if(!ret){
+          ret = t_tmp;
+        }else{
+          stp_curve_t* t_comp = NULL;
+          stp_curve_compose(&t_comp, ret, t_tmp, comp, -1);
+          if(t_comp){
+            stp_curve_destroy(ret);
+            ret = t_comp;
+          }
+          stp_curve_destroy(t_tmp);
+        }
+      }
+    }
+  }
 
-
-
+  /* apply result */
+  if(ret){
+    stp_set_curve_parameter(v, type, ret);
+    stp_curve_destroy(ret);
+  }
+}
 
 /*
  * 'canon_print()' - Print an image to a CANON printer.
@@ -1649,11 +1755,10 @@ 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	*media_source = stp_get_string_parameter(v, "InputSlot");
   const char    *duplex_mode =stp_get_string_parameter(v, "Duplex");
   int           page_number = stp_get_int_parameter(v, "PageNumber");
-  const canon_cap_t * caps= canon_get_model_capabilities(model);
+  const canon_cap_t * caps= canon_get_model_capabilities(v);
   int		y;		/* Looping vars */
   canon_privdata_t privdata;
   int		errdiv,		/* Error dividend */
@@ -1694,7 +1799,8 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
   /* find the wanted print mode */
   privdata.mode = canon_get_current_mode(v);
 
-
+  /* set quality */
+  privdata.quality = privdata.mode->quality;
 
   /* force grayscale if image is grayscale
    *                 or single black cartridge installed
@@ -1744,6 +1850,7 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
 
   if (privdata.used_inks == CANON_INK_K)
     stp_scale_float_parameter(v, "Gamma", 1.25);
+  stp_scale_float_parameter( v, "Gamma", privdata.mode->gamma );
 
   stp_deprintf(STP_DBG_CANON,"density is %f\n",
                stp_get_float_parameter(v, "Density"));
@@ -1899,37 +2006,11 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
   errval  = 0;
   errlast = -1;
   errline  = 0;
- 
-  if (!stp_check_curve_parameter(v, "HueMap", STP_PARAMETER_ACTIVE)) 
-    {
-      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)) 
-    {
-      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)) 
-    {
-      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);
-      }
-    }
+
+  /* set Hue, Lum and Sat Maps */ 
+  canon_set_curve_parameter(v,"HueMap",STP_CURVE_COMPOSE_ADD,caps->hue_adjustment,privdata.pt->hue_adjustment,privdata.mode->hue_adjustment);
+  canon_set_curve_parameter(v,"LumMap",STP_CURVE_COMPOSE_MULTIPLY,caps->lum_adjustment,privdata.pt->lum_adjustment,privdata.mode->lum_adjustment);
+  canon_set_curve_parameter(v,"SatMap",STP_CURVE_COMPOSE_MULTIPLY,caps->sat_adjustment,privdata.pt->sat_adjustment,privdata.mode->sat_adjustment);
 
   out_channels = stp_color_init(v, image, 65536);
   stp_allocate_component_data(v, "Driver", NULL, NULL, &privdata);
@@ -2072,7 +2153,8 @@ static const stp_printfuncs_t print_canon_printfuncs =
   canon_describe_output,
   stp_verify_printer_params,
   canon_start_job,
-  canon_end_job
+  canon_end_job,
+  NULL
 };
 
 static void
@@ -2098,7 +2180,7 @@ static int canon_compress(stp_vars_t *v, canon_privdata_t *pd, unsigned char* li
 
   /* Don't send blank lines... */
 
-  if (line[0] == 0 && memcmp(line, line + 1, length - 1) == 0)
+  if (line[0] == 0 && memcmp(line, line + 1, (length * bits)  - 1) == 0)
     return 0;
 
   offset2 = offset / 8;
@@ -2187,7 +2269,6 @@ canon_write(stp_vars_t *v,		/* I - Print file or command */
 	    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 */
@@ -2245,7 +2326,7 @@ canon_write_line(stp_vars_t *v)
       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->length, num,
                                &(pd->emptylines), pd->out_width,
                                pd->left, channel->props->bits, channel->props->flags);
       } 
@@ -2379,7 +2460,7 @@ canon_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
 
                   written += canon_write(v, pd, pd->caps,
                                (unsigned char *)(bufs[0].v[color] + line * linelength),
-                               linelength, idx[color], pd->mode->ydpi,
+                               linelength, idx[color],
                                &(pd->emptylines), pd->out_width,
                                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-color.c b/src/main/print-color.c
index 592c90c..b6ffabd 100644
--- a/src/main/print-color.c
+++ b/src/main/print-color.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-color.c,v 1.135.8.1 2007/05/29 01:47:29 rlk Exp $"
+ * "$Id: print-color.c,v 1.135.8.2 2007/12/15 20:35:45 rlk Exp $"
  *
  *   Gutenprint color management module - traditional Gutenprint algorithm.
  *
@@ -657,7 +657,7 @@ stpi_color_traditional_get_row(stp_vars_t *v,
   const lut_t *lut = (const lut_t *)(stp_get_component_data(v, "Color"));
   unsigned zero;
   if (stp_image_get_row(image, lut->in_data,
-			lut->image_width * lut->in_channels, row)
+			lut->image_width * lut->in_channels * lut->channel_depth / 8, row)
       != STP_IMAGE_STATUS_OK)
     return 2;
   if (!lut->channels_are_initialized)
diff --git a/src/main/print-escp2-data.c b/src/main/print-escp2-data.c
index 1327e7f..e8aa6c4 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.6.2 2007/05/29 01:47:29 rlk Exp $"
+ * "$Id: print-escp2-data.c,v 1.202.6.4 2007/12/29 20:42:27 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -70,6 +70,9 @@ static const escp2_dot_size_t c3pl_dotsizes =
 static const escp2_dot_size_t c3pl_pigment_dotsizes =
 { 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12 };
 
+static const escp2_dot_size_t c3pl_pigment_c120_dotsizes =
+{ 0x11, 0x11, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13 };
+
 static const escp2_dot_size_t p3pl_dotsizes =
 { 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12 };
 
@@ -253,6 +256,9 @@ static const escp2_densities_t c3pl_pigment_densities =
 static const escp2_densities_t c3pl_pigment_c66_densities =
 { 2.8, 1.4,  0.70, 0.600, 0.512, 0.512, 0.512, 0.0,   0.0   };
 
+static const escp2_densities_t c3pl_pigment_c120_densities =
+{ 4.0, 2.0,  1.56, 0.780, 0.512, 0.512, 0.512, 0.256, 0.128 };
+
 static const escp2_densities_t c3pl_densities =
 { 2.6, 1.3,  0.65, 0.730, 0.7,   0.91,  0.455, 0.0,   0.0   };
 
@@ -372,6 +378,8 @@ static const stp_raw_t sprx600_borderless_sequence = STP_RAW_STRING("SN\114\000\
 
 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");
 
+static const stp_raw_t sc120_borderless_sequence = STP_RAW_STRING("SN\001\000\000US\003\000\000\000\002");
+
 #define INCH(x)		(72 * x)
 
 const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
@@ -382,7 +390,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -400,7 +408,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -418,7 +426,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -436,7 +444,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
@@ -454,7 +462,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -472,7 +480,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -490,7 +498,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -510,7 +518,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
@@ -528,7 +536,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
@@ -546,7 +554,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
     360, 14400, -1, 720, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
@@ -566,7 +574,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO),
     21, 1, 4, 21, 1, 4, 21, 1, 4, 4,
     360, 14400, -1, 720, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
@@ -584,7 +592,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1999 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
@@ -602,7 +610,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -620,7 +628,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
     360, 14400, -1, 1440, 720, 180, 180,
     0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
@@ -638,7 +646,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
@@ -656,7 +664,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
@@ -674,7 +682,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -692,7 +700,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -710,7 +718,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1999 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
@@ -728,7 +736,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -746,7 +754,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
@@ -764,7 +772,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
     360, 14400, 360, 720, 720, 90, 90,
     0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
@@ -782,7 +790,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
@@ -800,7 +808,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
@@ -818,7 +826,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -836,7 +844,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     32, 1, 4, 64, 1, 2, 64, 1, 2, 4,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
@@ -854,7 +862,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 6,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
@@ -872,7 +880,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 6,
     360, 14400, -1, 1440, 720, 180, 180,
     0, 1, 0, 0, 0, 0, 0, 4, 1, 28800, 720 * 720,
@@ -890,7 +898,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -908,7 +916,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -926,7 +934,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -944,7 +952,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -962,7 +970,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
     360, 14400, -1, 2880, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
@@ -980,7 +988,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
     360, 14400, -1, 2880, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
@@ -998,7 +1006,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
     360, 14400, -1, 2880, 720, 180, 180,
     38, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
@@ -1016,7 +1024,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1034,7 +1042,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1052,7 +1060,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1070,7 +1078,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
     360, 14400, 360, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
@@ -1088,7 +1096,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -1106,7 +1114,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -1124,7 +1132,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -1142,7 +1150,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
     360, 14400, -1, 720, 720, 90, 90,
     0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
@@ -1160,7 +1168,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
@@ -1178,7 +1186,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     60, 60, 2, 180, 180, 2, 180, 180, 2, 4,
     360, 14400, -1, 2880, 1440, 360, 180,
     0, 1, 0, 0, 0, -240, 0, 0, 1, 28800, 720 * 720,
@@ -1196,7 +1204,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_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, 0, 1, 28800, 720 * 720,
@@ -1214,7 +1222,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     96, 96, 2, 96, 96, 2, 24, 24, 1, 6,
     360, 14400, -1, 2880, 1440, 360, 180,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1230,9 +1238,9 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
   /* 47: Stylus Photo 2100/2200 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
+     MODEL_ZEROMARGIN_H_ONLY | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_YES),
     96, 96, 2, 96, 96, 2, 192, 192, 1, 7,
     360, 14400, -1, 2880, 1440, 360, 180,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1250,7 +1258,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_PRO | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
     360, 14400, -1, 2880, 1440, 360, 180,
     0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1268,7 +1276,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_PRO | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
     360, 14400, -1, 2880, 1440, 360, 180,
     0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1286,7 +1294,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
     360, 14400, -1, 2880, 1440, 90, 90,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
@@ -1304,7 +1312,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
     360, 14400, -1, 2880, 1440, 90, 90,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
@@ -1322,7 +1330,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
     360, 14400, -1, 2880, 1440, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
@@ -1340,7 +1348,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
      MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     96, 96, 2, 96, 96, 2, 24, 24, 1, 6,
     360, 14400, -1, 2880, 1440, 360, 180,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1358,7 +1366,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
@@ -1376,7 +1384,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
     360, 14400, -1, 2880, 1440, 360, 180,
     0, 1, 0, 0, 0, -240, 0, 0, 1, 28800, 720 * 720,
@@ -1394,7 +1402,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
     360, 14400, -1, 1440, 720, 90, 90,
     0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
@@ -1412,7 +1420,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
      MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     180, 180, 2, 360, 360, 1, 360, 360, 1, 7,
     360, 14400, -1, 2880, 2880, 720, 360,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1430,7 +1438,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     90, 90, 2, 90, 90, 2, 90, 90, 2, 6,
     360, 14400, -1, 2880, 2880, 720, 360,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1448,7 +1456,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
      MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
     360, 14400, -1, 2880, 720, 90, 90,
     0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
@@ -1466,7 +1474,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1484,7 +1492,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
     360, 14400, -1, 2880, 1440, 360, 120,
     0, 1, 0, 80, 42, -180, 0, 0, 1, 28800, 1440 * 720,
@@ -1502,7 +1510,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1520,7 +1528,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1538,7 +1546,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
     360, 28800, -1, 5760, 2880, 360, 180,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 180, 5760 * 2880,
@@ -1556,7 +1564,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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, 180, 1440 * 1440,
@@ -1574,7 +1582,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
     360, 14400, -1, 2880, 1440, 360, 120,
     0, 1, 0, 80, 42, -180, 0, 0, 1, 28800, 1440 * 720,
@@ -1592,7 +1600,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
     360, 28800, -1, 5760, 2880, 360, 180,
     0, 1, 0, 96, 42, 0, 0, 0, 1, 180, 5760 * 2880,
@@ -1610,7 +1618,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
     360, 14400, -1, 5760, 2880, 360, 180,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 180, 5760 * 2880,
@@ -1628,7 +1636,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1646,7 +1654,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 6,
     360, 28800, -1, 5760, 2880, 360, 180,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1664,7 +1672,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
     360, 14400, -1, 5760, 2880, 360, 180,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 180, 1440 * 1440,
@@ -1682,7 +1690,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
     360, 14400, -1, 2880, 1440, 360, 120,
     0, 1, 0, 80, 42, -180, 0, 0, 1, 28800, 1440 * 720,
@@ -1700,7 +1708,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
     360, 28800, -1, 5760, 1440, 1440, 720,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1718,7 +1726,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     90, 90, 3, 90, 90, 3, 90, 90, 3, 4,
     360, 14400, -1, 5760, 1440, 360, 120,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1736,7 +1744,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
      MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     90, 90, 3, 90, 90, 3, 90, 90, 3, 4,
     360, 14400, -1, 5760, 1440, 360, 120,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1754,7 +1762,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
      MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     90, 90, 3, 90, 90, 3, 90, 90, 3, 6,
     360, 14400, -1, 5760, 1440, 360, 120,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1772,7 +1780,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
     360, 14400, -1, 2880, 1440, 360, 120,
     0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
@@ -1790,7 +1798,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1808,7 +1816,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1826,7 +1834,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1844,7 +1852,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1855,14 +1863,14 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     "superfine", "claria",
     variable_bits, c1_5_base_res, "cd_roll_feed",
     "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
+    NULL, NULL, "sp1400"
   },
   /* 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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1873,14 +1881,14 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     "claria_1400", "claria",
     variable_bits, claria_1400_base_res, "cd_roll_feed",
     "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
+    NULL, NULL, "sp1400"
   },
   /* 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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1898,7 +1906,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     (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),
+     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO),
     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,
@@ -1911,6 +1919,24 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     "standard", &new_init_sequence, &je_deinit_sequence,
     &sprx500_borderless_sequence, NULL, "photo"
   },
+  /* 85: Stylus C120 */
+  {
+    (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| MODEL_INTERCHANGEABLE_INK_NO),
+    59, 60, 2, 360, 1, 1, 360, 1, 1, 4,
+    360, 14400, -1, 5760, 1440, 360, 180,
+    0, 1, 0, 80, 42, -240, 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, -1, -1, 0, 0, 24,
+    4, 15, 0, 0,
+    c3pl_pigment_c120_dotsizes, c3pl_pigment_c120_densities, "variable_3pl_pigment_c120",
+    "superfine", "c120",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &sc120_borderless_sequence, NULL, "c120"
+  },
 };
 
 const int stpi_escp2_model_limit =
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index 191fa34..582702f 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.c,v 1.355.2.2 2007/05/29 01:47:29 rlk Exp $"
+ * "$Id: print-escp2.c,v 1.355.2.4 2007/12/29 20:42:27 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -67,6 +67,7 @@ static const escp2_printer_attr_t escp2_printer_attrs[] =
   { "send_zero_advance",       10, 1 },
   { "supports_ink_change",     11, 1 },
   { "packet_mode",             12, 1 },
+  { "interchangeable_ink",     13, 1 },
 };
 
 typedef struct
@@ -314,7 +315,13 @@ static const stp_parameter_t the_parameters[] =
   },
   {
     "SupportsPacketMode", N_("Supports Packet Mode"), N_("Advanced Printer Functionality"),
-    N_("Alternate Alignment Choices"),
+    N_("Supports D4 Packet Mode"),
+    STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+  },
+  {
+    "InterchangeableInk", N_("Has Interchangeable Ink Cartridges"), N_("Advanced Printer Functionality"),
+    N_("Has multiple choices of ink cartridges"),
     STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
     STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
   },
@@ -872,7 +879,8 @@ 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));
+	  escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_FULL) ||
+	  escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_H_ONLY));
 }
 
 static int
@@ -1427,16 +1435,23 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q,
 {
   const res_t *const *res = escp2_reslist(v);
   int i = 0;
-  if (q->desired_hres < 0)
+  stp_dprintf(STP_DBG_ESCP2, v, "Quality %s: min %d %d max %d %d, des %d %d\n",
+	      q->name, q->min_hres, q->min_vres, q->max_hres, q->max_vres,
+	      q->desired_hres, q->desired_vres);
+  if (q->desired_hres < 0 || q->desired_vres < 0)
     {
       while (res[i])
 	i++;
       i--;
       while (i >= 0)
 	{
-	  stp_dprintf(STP_DBG_ESCP2, v, "Checking resolution %s %d...",
+	  stp_dprintf(STP_DBG_ESCP2, v, "  Checking resolution %s %d...\n",
 		      res[i]->name, i);
-	  if (verify_resolution(v, res[i]) &&
+	  if ((q->max_hres <= 0 || res[i]->printed_hres <= q->max_hres) &&
+	      (q->max_vres <= 0 || res[i]->printed_vres <= q->max_vres) &&
+	      q->min_hres <= res[i]->printed_hres &&
+	      q->min_vres <= res[i]->printed_vres &&
+	      verify_resolution(v, res[i]) &&
 	      verify_resolution_by_paper_type(v, res[i]))
 	    return res[i];
 	  i--;
@@ -1448,31 +1463,31 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q,
       unsigned desired_hres = q->desired_hres;
       unsigned desired_vres = q->desired_vres;
       get_resolution_bounds_by_paper_type(v, &max_x, &max_y, &min_x, &min_y);
-      stp_dprintf(STP_DBG_ESCP2, v, "Comparing hres %d to %d, %d\n",
+      stp_dprintf(STP_DBG_ESCP2, v, "  Comparing hres %d to %d, %d\n",
 		  desired_hres, min_x, max_x);
-      stp_dprintf(STP_DBG_ESCP2, v, "Comparing vres %d to %d, %d\n",
+      stp_dprintf(STP_DBG_ESCP2, v, "  Comparing vres %d to %d, %d\n",
 		  desired_vres, min_y, max_y);
       if (max_x > 0 && desired_hres > max_x)
 	{
-	  stp_dprintf(STP_DBG_ESCP2, v, "Decreasing hres from %d to %d\n",
+	  stp_dprintf(STP_DBG_ESCP2, v, "  Decreasing hres from %d to %d\n",
 		      desired_hres, max_x);
 	  desired_hres = max_x;
 	}
       else if (desired_hres < min_x)
 	{
-	  stp_dprintf(STP_DBG_ESCP2, v, "Increasing hres from %d to %d\n",
+	  stp_dprintf(STP_DBG_ESCP2, v, "  Increasing hres from %d to %d\n",
 		      desired_hres, min_x);
 	  desired_hres = min_x;
 	}
       if (max_y > 0 && desired_vres > max_y)
 	{
-	  stp_dprintf(STP_DBG_ESCP2, v, "Decreasing vres from %d to %d\n",
+	  stp_dprintf(STP_DBG_ESCP2, v, "  Decreasing vres from %d to %d\n",
 		      desired_vres, max_y);
 	  desired_vres = max_y;
 	}
       else if (desired_vres < min_y)
 	{
-	  stp_dprintf(STP_DBG_ESCP2, v, "Increasing vres from %d to %d\n",
+	  stp_dprintf(STP_DBG_ESCP2, v, "  Increasing vres from %d to %d\n",
 		      desired_vres, min_y);
 	  desired_vres = min_y;
 	}
@@ -1484,7 +1499,7 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q,
 	      res[i]->printed_hres == desired_hres)
 	    {
 	      stp_dprintf(STP_DBG_ESCP2, v,
-			  "Found desired resolution w/o oversample: %s %d: %d * %d, %d\n",
+			  "  Found desired resolution w/o oversample: %s %d: %d * %d, %d\n",
 			  res[i]->name, i, res[i]->printed_hres,
 			  res[i]->vertical_passes, res[i]->printed_vres);
 	      return res[i];
@@ -1499,7 +1514,7 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q,
 	      res[i]->printed_hres * res[i]->vertical_passes == desired_hres)
 	    {
 	      stp_dprintf(STP_DBG_ESCP2, v,
-			  "Found desired resolution: %s %d: %d * %d, %d\n",
+			  "  Found desired resolution: %s %d: %d * %d, %d\n",
 			  res[i]->name, i, res[i]->printed_hres,
 			  res[i]->vertical_passes, res[i]->printed_vres);
 	      return res[i];
@@ -1518,7 +1533,7 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q,
 	       res[i]->printed_hres * res[i]->vertical_passes <= q->max_hres))
 	    {
 	      stp_dprintf(STP_DBG_ESCP2, v,
-			  "Found acceptable resolution: %s %d: %d * %d, %d\n",
+			  "  Found acceptable resolution: %s %d: %d * %d, %d\n",
 			  res[i]->name, i, res[i]->printed_hres,
 			  res[i]->vertical_passes, res[i]->printed_vres);
 	      return res[i];
@@ -1984,7 +1999,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "SupportsPacketMode") == 0)
     {
-      description->deflt.integer =
+      description->deflt.boolean =
 	escp2_has_cap(v, MODEL_PACKET_MODE, MODEL_PACKET_MODE_YES);
     }
   else if (strcmp(name, "PrintingMode") == 0)
@@ -2724,6 +2739,41 @@ setup_head_offset(stp_vars_t *v)
 }
 
 static void
+setup_split_channels(stp_vars_t *v)
+{
+  escp2_privdata_t *pd = get_privdata(v);
+  /*
+   * Set up the output channels
+   */
+  if (pd->physical_channels == 1 &&
+      
+      pd->inkname->channel_set->channels[0]->subchannels->split_channel_count > 1)
+    {
+      int i;
+      int incr = 1;
+      pd->split_channel_count =
+	pd->inkname->channel_set->channels[0]->subchannels->split_channel_count;
+      if (pd->res->vres <
+	  (escp2_base_separation(v) / escp2_black_nozzle_separation(v)))
+	{
+	  incr =
+	    (escp2_base_separation(v) / escp2_black_nozzle_separation(v)) /
+	    pd->res->vres;
+	  pd->split_channel_count /= incr;
+	  pd->nozzle_separation *= incr;
+	  pd->nozzles /= incr;
+	  pd->min_nozzles /= incr;
+	}
+      pd->split_channels = stp_malloc(pd->split_channel_count * sizeof(short));
+      for (i = 0; i < pd->split_channel_count; i++)
+	pd->split_channels[i] =
+	  pd->inkname->channel_set->channels[0]->subchannels->split_channels[i * incr];
+    }
+  else
+    pd->split_channel_count = 0;
+}
+
+static void
 setup_basic(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
@@ -2893,8 +2943,9 @@ setup_softweave_parameters(stp_vars_t *v)
   escp2_privdata_t *pd = get_privdata(v);
   pd->horizontal_passes = pd->res->printed_hres / pd->physical_xdpi;
   if (pd->physical_channels == 1 &&
-      (pd->res->vres >=
-       (escp2_base_separation(v) / escp2_black_nozzle_separation(v))) &&
+      (pd->inkname->channel_set->channels[0]->subchannels->split_channel_count > 1 ||
+       (pd->res->vres >=
+	(escp2_base_separation(v) / escp2_black_nozzle_separation(v)))) &&
       (escp2_max_black_resolution(v) < 0 ||
        pd->res->vres <= escp2_max_black_resolution(v)) &&
       escp2_black_nozzles(v))
@@ -2987,6 +3038,7 @@ setup_head_parameters(stp_vars_t *v)
     pd->horizontal_passes = 1;
 
   setup_head_offset(v);
+  setup_split_channels(v);
 
   if (strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") == 0 &&
       pd->physical_channels == 1)
@@ -3067,6 +3119,13 @@ setup_page(stp_vars_t *v)
 	escp2_zero_margin_offset(v) * pd->page_management_units /
 	escp2_base_separation(v);
     }
+  else if (escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_H_ONLY) &&
+	   (stp_get_boolean_parameter(v, "FullBleed")) &&
+	   ((!input_slot || !(input_slot->is_cd))))
+    {
+      pd->paper_extra_bottom = 0;
+      pd->page_extra_height = 0;
+    }
   else
     {
       pd->page_extra_height = 0;
@@ -3113,6 +3172,19 @@ setup_page(stp_vars_t *v)
   pd->image_width = stp_get_width(v);
   pd->image_scaled_width = pd->image_width * pd->res->hres / 72;
   pd->image_printed_width = pd->image_width * pd->res->printed_hres / 72;
+  if (pd->split_channel_count >= 1)
+    {
+      pd->split_channel_width =
+	((pd->image_printed_width + pd->horizontal_passes - 1) /
+	 pd->horizontal_passes);
+      pd->split_channel_width = (pd->split_channel_width + 7) / 8;
+      pd->split_channel_width *= pd->bitwidth;
+      if (COMPRESSION)
+	{
+	  pd->comp_buf =
+	    stp_malloc(stp_compute_tiff_linewidth(v, pd->split_channel_width));
+	}
+    }
   pd->image_left_position = pd->image_left * pd->micro_units / 72;
   pd->zero_margin_offset = escp2_zero_margin_offset(v);
   if (supports_borderless(v) &&
@@ -3342,6 +3414,10 @@ escp2_print_page(stp_vars_t *v, stp_image_t *image)
       stp_free(pd->cols[i]);
   stp_free(pd->cols);
   stp_free(pd->channels);
+  if (pd->split_channels)
+    stp_free(pd->split_channels);
+  if (pd->comp_buf)
+    stp_free(pd->comp_buf);
   return status;
 }
 
@@ -3454,7 +3530,8 @@ static const stp_printfuncs_t print_escp2_printfuncs =
   escp2_describe_output,
   stp_verify_printer_params,
   escp2_job_start,
-  escp2_job_end
+  escp2_job_end,
+  NULL
 };
 
 static stp_family_t print_escp2_module_data =
diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h
index f75354a..4f88f4d 100644
--- a/src/main/print-escp2.h
+++ b/src/main/print-escp2.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.h,v 1.105.6.2 2007/05/29 01:47:29 rlk Exp $"
+ * "$Id: print-escp2.h,v 1.105.6.4 2007/12/29 20:42:28 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -175,8 +175,10 @@ typedef struct
   short color;
   short subchannel;
   short head_offset;
+  short split_channel_count;
   const char *channel_density;
   const char *subchannel_scale;
+  const short split_channels[PHYSICAL_CHANNEL_LIMIT];
 } physical_subchannel_t;
 
 typedef struct
@@ -373,6 +375,7 @@ typedef struct
 #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_ZEROMARGIN_H_ONLY	0x30ul /* (print to edge of the paper) */
 
 #define MODEL_VARIABLE_DOT_MASK	0x40ul /* Does this printer support var */
 #define MODEL_VARIABLE_NO	0x00ul /* dot size printing? The newest */
@@ -402,6 +405,10 @@ typedef struct
 #define MODEL_PACKET_MODE_NO	0x0000ul
 #define MODEL_PACKET_MODE_YES	0x1000ul
 
+#define MODEL_INTERCHANGEABLE_INK_MASK	0x2000ul
+#define MODEL_INTERCHANGEABLE_INK_NO	0x0000ul
+#define MODEL_INTERCHANGEABLE_INK_YES	0x1000ul
+
 typedef enum
 {
   MODEL_COMMAND,
@@ -413,6 +420,7 @@ typedef enum
   MODEL_SEND_ZERO_ADVANCE,
   MODEL_SUPPORTS_INK_CHANGE,
   MODEL_PACKET_MODE,
+  MODEL_INTERCHANGEABLE_INK,
   MODEL_LIMIT
 } escp2_model_option_t;
 
@@ -560,6 +568,9 @@ typedef struct
   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 */
+  int split_channel_count;	/* For split black channels, like C120 */
+  int split_channel_width;	/* Linewidth for split black channels */
+  short *split_channels;
 
   /* Ink parameters */
   int bitwidth;			/* Number of bits per ink drop */
@@ -642,6 +653,7 @@ typedef struct
   int last_color;		/* Last color we printed */
   int last_pass_offset;		/* Starting row of last pass we printed */
   int last_pass;		/* Last pass printed */
+  unsigned char *comp_buf;	/* Compression buffer for C120-type printers */
 
 } escp2_privdata_t;
 
@@ -658,12 +670,12 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v);
 #define PACKFUNC stp_pack_uncompressed
 #else
 #define COMPRESSION (1)
-#define FILLFUNC stp_fill_tiff
-#define COMPUTEFUNC stp_compute_tiff_linewidth
-#define PACKFUNC stp_pack_tiff
+#define FILLFUNC pd->split_channel_count > 0 ? stp_fill_uncompressed : stp_fill_tiff
+#define COMPUTEFUNC pd->split_channel_count > 0 ? stp_compute_uncompressed_linewidth : stp_compute_tiff_linewidth
+#define PACKFUNC pd->split_channel_count > 0 ? stp_pack_uncompressed : stp_pack_tiff
 #endif
 
 #endif /* GUTENPRINT_INTERNAL_ESCP2_H */
 /*
- * End of "$Id: print-escp2.h,v 1.105.6.2 2007/05/29 01:47:29 rlk Exp $".
+ * End of "$Id: print-escp2.h,v 1.105.6.4 2007/12/29 20:42:28 rlk Exp $".
  */
diff --git a/src/main/print-lexmark.c b/src/main/print-lexmark.c
index 5028b37..69bc08f 100644
--- a/src/main/print-lexmark.c
+++ b/src/main/print-lexmark.c
@@ -1,6 +1,6 @@
 
 /*
- * "$Id: print-lexmark.c,v 1.154 2006/05/28 16:59:05 rlk Exp $"
+ * "$Id: print-lexmark.c,v 1.154.8.1 2007/12/15 20:35:48 rlk Exp $"
  *
  *   Print plug-in Lexmark driver for the GIMP.
  *
@@ -2167,6 +2167,7 @@ static const stp_printfuncs_t print_lexmark_printfuncs =
   lexmark_describe_output,
   stp_verify_printer_params,
   NULL,
+  NULL,
   NULL
 };
 
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index 7c02b15..e2ef864 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-olympus.c,v 1.61.2.1 2007/03/02 12:01:30 rlk Exp $"
+ * "$Id: print-olympus.c,v 1.61.2.3 2007/12/29 20:42:28 rlk Exp $"
  *
  *   Print plug-in DyeSub driver (formerly Olympus driver) for the GIMP.
  *
@@ -89,8 +89,8 @@ typedef struct {
 
 typedef struct {
   const char* name;
-  int xdpi;
-  int ydpi;
+  int w_dpi;
+  int h_dpi;
 } dyesub_resolution_t;
 
 typedef struct {
@@ -141,13 +141,14 @@ typedef struct {
 
 typedef struct
 {
-  int xdpi, ydpi;
-  int xsize, ysize;
+  int w_dpi, h_dpi;
+  int w_size, h_size;
   char plane;
-  int block_min_x, block_min_y;
-  int block_max_x, block_max_y;
+  int block_min_w, block_min_h;
+  int block_max_w, block_max_h;
   const char* pagesize;
   const laminate_t* laminate;
+  int print_mode;
 } dyesub_privdata_t;
 
 static dyesub_privdata_t privdata;
@@ -265,10 +266,10 @@ static void p10_printer_end_func(stp_vars_t *v)
 static void p10_block_init_func(stp_vars_t *v)
 {
   stp_zprintf(v, "\033T%c", privdata.plane);
-  stp_put16_le(privdata.block_min_x, v);
-  stp_put16_le(privdata.block_min_y, v);
-  stp_put16_le(privdata.block_max_x + 1, v);
-  stp_put16_le(privdata.block_max_y + 1, v);
+  stp_put16_le(privdata.block_min_w, v);
+  stp_put16_le(privdata.block_min_h, v);
+  stp_put16_le(privdata.block_max_w + 1, v);
+  stp_put16_le(privdata.block_max_h + 1, v);
 }
 
 static const laminate_t p10_laminate[] =
@@ -312,7 +313,7 @@ static void p200_printer_init_func(stp_vars_t *v)
 static void p200_plane_init_func(stp_vars_t *v)
 {
   stp_zprintf(v, "P0%d9999", 3 - privdata.plane+1 );
-  stp_put32_be(privdata.xsize * privdata.ysize, v);
+  stp_put32_be(privdata.w_size * privdata.h_size, v);
 }
 
 static void p200_printer_end_func(stp_vars_t *v)
@@ -366,8 +367,8 @@ static void p300_printer_init_func(stp_vars_t *v)
 {
   stp_zfwrite("\033\033\033C\033N\1\033F\0\1\033MS\xff\xff\xff"
 	      "\033Z", 1, 19, v);
-  stp_put16_be(privdata.xdpi, v);
-  stp_put16_be(privdata.ydpi, v);
+  stp_put16_be(privdata.w_dpi, v);
+  stp_put16_be(privdata.h_dpi, v);
 }
 
 static void p300_plane_end_func(stp_vars_t *v)
@@ -382,14 +383,14 @@ static void p300_block_init_func(stp_vars_t *v)
 {
   const char *c = "CMY";
   stp_zprintf(v, "\033\033\033W%c", c[privdata.plane-1]);
-  stp_put16_be(privdata.block_min_y, v);
-  stp_put16_be(privdata.block_min_x, v);
-  stp_put16_be(privdata.block_max_y, v);
-  stp_put16_be(privdata.block_max_x, v);
+  stp_put16_be(privdata.block_min_h, v);
+  stp_put16_be(privdata.block_min_w, v);
+  stp_put16_be(privdata.block_max_h, v);
+  stp_put16_be(privdata.block_max_w, v);
 
   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);
+	privdata.block_min_w, privdata.block_max_w,
+	privdata.block_min_h, privdata.block_max_h);
 }
 
 static const char p300_adj_cyan[] =
@@ -472,13 +473,13 @@ static void p400_printer_init_func(stp_vars_t *v)
   stp_zprintf(v, "\033ZS");
   if (wide)
     {
-      stp_put16_be(privdata.ysize, v);
-      stp_put16_be(privdata.xsize, v);
+      stp_put16_be(privdata.h_size, v);
+      stp_put16_be(privdata.w_size, v);
     }
   else
     {
-      stp_put16_be(privdata.xsize, v);
-      stp_put16_be(privdata.ysize, v);
+      stp_put16_be(privdata.w_size, v);
+      stp_put16_be(privdata.h_size, v);
     }
   dyesub_nputc(v, '\0', 57);
   stp_zprintf(v, "\033ZP"); dyesub_nputc(v, '\0', 61);
@@ -502,17 +503,17 @@ static void p400_block_init_func(stp_vars_t *v)
   stp_zprintf(v, "\033Z%c", '3' - privdata.plane + 1);
   if (wide)
     {
-      stp_put16_be(privdata.ysize - privdata.block_max_y - 1, v);
-      stp_put16_be(privdata.xsize - privdata.block_max_x - 1, v);
-      stp_put16_be(privdata.block_max_y - privdata.block_min_y + 1, v);
-      stp_put16_be(privdata.block_max_x - privdata.block_min_x + 1, v);
+      stp_put16_be(privdata.h_size - privdata.block_max_h - 1, v);
+      stp_put16_be(privdata.w_size - privdata.block_max_w - 1, v);
+      stp_put16_be(privdata.block_max_h - privdata.block_min_h + 1, v);
+      stp_put16_be(privdata.block_max_w - privdata.block_min_w + 1, v);
     }
   else
     {
-      stp_put16_be(privdata.block_min_x, v);
-      stp_put16_be(privdata.block_min_y, 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_put16_be(privdata.block_min_w, v);
+      stp_put16_be(privdata.block_min_h, v);
+      stp_put16_be(privdata.block_max_w - privdata.block_min_w + 1, v);
+      stp_put16_be(privdata.block_max_h - privdata.block_min_h + 1, v);
     }
   dyesub_nputc(v, '\0', 53);
 }
@@ -558,7 +559,6 @@ static const char p400_adj_yellow[] =
 
 
 /* Olympus P-440 series */
-/* FIXME: colors - BGR instead of RGB ?!? */
 static const dyesub_pagesize_t p440_page[] =
 {
   { "A4", NULL, -1, -1, 10, 9, 54, 54, DYESUB_PORTRAIT},
@@ -598,13 +598,13 @@ static void p440_printer_init_func(stp_vars_t *v)
   stp_zprintf(v, "\033ZS");
   if (wide)
     {
-      stp_put16_be(privdata.ysize, v);
-      stp_put16_be(privdata.xsize, v);
+      stp_put16_be(privdata.h_size, v);
+      stp_put16_be(privdata.w_size, v);
     }
   else
     {
-      stp_put16_be(privdata.xsize, v);
-      stp_put16_be(privdata.ysize, v);
+      stp_put16_be(privdata.w_size, v);
+      stp_put16_be(privdata.h_size, v);
     }
   dyesub_nputc(v, '\0', 57);
   if (strcmp(privdata.pagesize, "C6") == 0)
@@ -626,36 +626,35 @@ static void p440_block_init_func(stp_vars_t *v)
   stp_zprintf(v, "\033ZT");
   if (wide)
     {
-      stp_put16_be(privdata.ysize - privdata.block_max_y - 1, v);
-      stp_put16_be(privdata.xsize - privdata.block_max_x - 1, v);
-      stp_put16_be(privdata.block_max_y - privdata.block_min_y + 1, v);
-      stp_put16_be(privdata.block_max_x - privdata.block_min_x + 1, v);
+      stp_put16_be(privdata.h_size - privdata.block_max_h - 1, v);
+      stp_put16_be(privdata.w_size - privdata.block_max_w - 1, v);
+      stp_put16_be(privdata.block_max_h - privdata.block_min_h + 1, v);
+      stp_put16_be(privdata.block_max_w - privdata.block_min_w + 1, v);
     }
   else
     {
-      stp_put16_be(privdata.block_min_x, v);
-      stp_put16_be(privdata.block_min_y, 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_put16_be(privdata.block_min_w, v);
+      stp_put16_be(privdata.block_min_h, v);
+      stp_put16_be(privdata.block_max_w - privdata.block_min_w + 1, v);
+      stp_put16_be(privdata.block_max_h - privdata.block_min_h + 1, 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;
+  int pad = (64 - (((privdata.block_max_w - privdata.block_min_w + 1)
+	  * (privdata.block_max_h - privdata.block_min_h + 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);
+  		  privdata.block_max_w, privdata.block_min_w,
+	  	  privdata.block_max_h, privdata.block_min_h);
   stp_deprintf(STP_DBG_DYESUB, "dyesub: olympus-p440 padding=%d\n", pad);
   dyesub_nputc(v, '\0', pad);
 }
 
 
 /* Olympus P-S100 */
-/* FIXME: colors - BGR instead of RGB ?!? */
 static const dyesub_pagesize_t ps100_page[] =
 {
   { "w288h432", "4 x 6", 296, 426, 0, 0, 0, 0, DYESUB_PORTRAIT},/* 4x6" */
@@ -683,8 +682,8 @@ static void ps100_printer_init_func(stp_vars_t *v)
   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) */
+  stp_put16_be(privdata.h_size, v);	/* paper height (px) */
+  stp_put16_be(privdata.w_size, v);	/* paper width (px) */
   dyesub_nputc(v, '\0', 3);
   stp_putc('\1', v);	/* number of copies */
   dyesub_nputc(v, '\0', 8);
@@ -696,19 +695,19 @@ static void ps100_printer_init_func(stp_vars_t *v)
   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) */
+  stp_put16_be(privdata.w_size, v);	/* image width (px) */
+  stp_put16_be(privdata.h_size, 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;
+  int pad = (64 - (((privdata.block_max_w - privdata.block_min_w + 1)
+	  * (privdata.block_max_h - privdata.block_min_h + 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);
+  		  privdata.block_max_w, privdata.block_min_w,
+	  	  privdata.block_max_h, privdata.block_min_h);
   stp_deprintf(STP_DBG_DYESUB, "dyesub: olympus-ps100 padding=%d\n", pad);
   dyesub_nputc(v, '\0', pad);		/* padding to 64B blocks */
 
@@ -783,7 +782,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_put32_le(privdata.w_size * privdata.h_size, v);
   dyesub_nputc(v, '\0', 4);
 }
 
@@ -850,6 +849,48 @@ static const dyesub_printsize_t cp220_printsize[] =
 
 LIST(dyesub_printsize_list_t, cp220_printsize_list, dyesub_printsize_t, cp220_printsize);
 
+/* Canon SELPHY ES series */
+static void es1_printer_init_func(stp_vars_t *v)
+{
+  char pg = (strcmp(privdata.pagesize, "Postcard") == 0 ? 0x11 :
+	     (strcmp(privdata.pagesize, "w253h337") == 0 ? '\2' :
+	      (strcmp(privdata.pagesize, "w155h244") == 0 ? '\3' : 0x11 )));
+
+  /*
+   differs from cp-220 in that after the 0x4000, the next character
+   seems to be 0x01 instead of 0x00, and the P card size code is 
+   '0x11' instead of '0x1'
+   codes for other paper types are unknown.
+  */
+
+  stp_put16_be(0x4000, v);
+  stp_putc(0x10, v);
+  stp_putc(pg, v);
+  dyesub_nputc(v, '\0', 8);
+}
+
+static void es1_plane_init_func(stp_vars_t *v)
+{
+  unsigned char plane = 0;
+
+  switch (privdata.plane) {
+  case 3: /* Y */
+    plane = 0x01;
+    break;
+  case 2: /* M */
+    plane = 0x03;
+    break;
+  case 1: /* C */
+    plane = 0x07;
+    break;
+  }
+
+  stp_put16_be(0x4001, v);
+  stp_putc(0x1, v);
+  stp_putc(plane, v);
+  stp_put32_le(privdata.w_size * privdata.h_size, v);
+  dyesub_nputc(v, '\0', 4);
+}
 
 /* Sony DPP-EX5, DPP-EX7 */
 static const dyesub_resolution_t res_403dpi[] =
@@ -883,8 +924,8 @@ static void dppex5_printer_init(stp_vars_t *v)
   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_put32_be(privdata.w_size, v);
+  stp_put32_be(privdata.h_size, 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);
@@ -907,8 +948,8 @@ static void dppex5_printer_init(stp_vars_t *v)
 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);
+  stp_put32_be((privdata.block_max_w - privdata.block_min_w + 1)
+  		* (privdata.block_max_h - privdata.block_min_h + 1) * 3, v);
 }
 
 static void dppex5_printer_end(stp_vars_t *v)
@@ -929,8 +970,8 @@ LIST(laminate_list_t, dppex5_laminate_list, laminate_t, dppex5_laminate);
 /* Sony UP-DP10 */
 static const dyesub_pagesize_t updp10_page[] =
 {
-  { "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-10P23 (4x6)", -1, -1, 12, 12, 18, 18, DYESUB_LANDSCAPE},
+  { "w288h387", "UPC-10P34 (4x5)", -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},
 };
@@ -950,20 +991,22 @@ static void updp10_printer_init_func(stp_vars_t *v)
 {
   stp_zfwrite("\x98\xff\xff\xff\xff\xff\xff\xff"
 	      "\x09\x00\x00\x00\x1b\xee\x00\x00"
+	      "\x00\x02\x00\x00\x01\x12\x00\x00"
+	      "\x00\x1b\xe1\x00\x00\x00\x0b\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_put16_be(privdata.w_size, v);
+  stp_put16_be(privdata.h_size, 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_put16_be(privdata.w_size, v);
+  stp_put16_be(privdata.h_size, v);
+  stp_put32_le(privdata.w_size*privdata.h_size*3+11, v);
   stp_zfwrite("\x1b\xea\x00\x00\x00\x00", 1, 6, v);
-  stp_put32_be(privdata.xsize*privdata.ysize*3, v);
+  stp_put32_be(privdata.w_size*privdata.h_size*3, v);
   stp_zfwrite("\x00", 1, 1, v);
 }
 
@@ -1052,10 +1095,14 @@ LIST(dyesub_printsize_list_t, updr100_printsize_list, dyesub_printsize_t, updr10
 
 static void updr100_printer_init_func(stp_vars_t *v)
 {
+  int dim1 = (privdata.print_mode == DYESUB_LANDSCAPE ?
+  		privdata.h_size : privdata.w_size);
+  int dim2 = (privdata.print_mode == DYESUB_LANDSCAPE ?
+  		privdata.w_size : privdata.h_size);
 
   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_put32_le(dim1, v);
+  stp_put32_le(dim2, 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 */
@@ -1118,6 +1165,10 @@ LIST(dyesub_printsize_list_t, updr150_printsize_list, dyesub_printsize_t, updr15
 static void updr150_printer_init_func(stp_vars_t *v)
 {
   char pg = '\0';
+  int dim1 = (privdata.print_mode == DYESUB_LANDSCAPE ?
+  		privdata.w_size : privdata.h_size);
+  int dim2 = (privdata.print_mode == DYESUB_LANDSCAPE ?
+  		privdata.h_size : privdata.w_size);
 
   stp_zfwrite("\x6a\xff\xff\xff\xef\xff\xff\xff", 1, 8, v);
   if (strcmp(privdata.pagesize,"B7") == 0)
@@ -1142,19 +1193,19 @@ 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.ysize, v);
-  stp_put16_be(privdata.xsize, v);
+  stp_put16_be(dim1, v);
+  stp_put16_be(dim2, 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.ysize, v);
-  stp_put16_be(privdata.xsize, v);
+  stp_put16_be(dim1, v);
+  stp_put16_be(dim2, 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);
+  stp_put32_be(privdata.w_size*privdata.h_size*3, v);
   stp_zfwrite("\x00", 1, 1, v);
-  stp_put32_le(privdata.xsize*privdata.ysize*3, v);
+  stp_put32_le(privdata.w_size*privdata.h_size*3, v);
 }
 
 static void updr150_printer_end_func(stp_vars_t *v)
@@ -1204,8 +1255,8 @@ static void cx400_printer_init_func(stp_vars_t *v)
   stp_zfwrite("FUJIFILM", 1, 8, v);
   stp_zfwrite(pname, 1, 6, v);
   stp_putc('\0', v);
-  stp_put16_le(privdata.xsize, v);
-  stp_put16_le(privdata.ysize, v);
+  stp_put16_le(privdata.w_size, v);
+  stp_put16_le(privdata.h_size, v);
   if (strcmp(privdata.pagesize,"w288h504") == 0)
     pg = '\x0d';
   else if (strcmp(privdata.pagesize,"w288h432") == 0)
@@ -1253,8 +1304,8 @@ static void nx500_printer_init_func(stp_vars_t *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_put16_le(privdata.h_size, v);
+  stp_put16_le(privdata.w_size, v);
   stp_zfwrite("\x00\x02\x00\x70\x2f", 1, 5, v);
   dyesub_nputc(v, '\0', 43);
 }
@@ -1289,11 +1340,67 @@ 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);
+  stp_put32_le(privdata.w_size*privdata.h_size, v);
   dyesub_nputc(v, '\0', 4);
 }
 
 
+/* Shinko CHC-S9045 (experimental) */
+static const dyesub_pagesize_t shinko_chcs9045_page[] =
+{
+  { "w288h432",	"4x6", PT(1240,300)+1, PT(1844,300)+1, 0, 0, 0, 0,
+  							DYESUB_LANDSCAPE},
+  { "B7",	"3.5x5", PT(1088,300)+1, PT(1548,300)+1, 0, 0, 0, 0,
+  							DYESUB_LANDSCAPE},
+  { "w360h504",	"5x7", PT(1548,300)+1, PT(2140,300)+1, 0, 0, 0, 0,
+  							DYESUB_PORTRAIT},
+  { "w432h576",	"6x9", PT(1844,300)+1, PT(2740,300)+1, 0, 0, 0, 0,
+  							DYESUB_PORTRAIT},
+  { "w283h425",	"Sticker paper", PT(1092,300)+1, PT(1726,300)+1, 0, 0, 0, 0,
+  							DYESUB_LANDSCAPE},
+  { "Custom",   NULL, PT(1240,300)+1, PT(1844,300)+1, 0, 0, 0, 0,
+  							DYESUB_LANDSCAPE},
+};
+
+LIST(dyesub_pagesize_list_t, shinko_chcs9045_page_list, dyesub_pagesize_t, shinko_chcs9045_page);
+
+static const dyesub_printsize_t shinko_chcs9045_printsize[] =
+{
+  { "300x300", "w288h432", 1240, 1844},
+  { "300x300", "B7", 1088, 1548},
+  { "300x300", "w360h504", 1548, 2140},
+  { "300x300", "w432h576", 1844, 2740},
+  { "300x300", "w283h425", 1092, 1726},
+  { "300x300", "Custom", 1240, 1844},
+};
+
+LIST(dyesub_printsize_list_t, shinko_chcs9045_printsize_list, dyesub_printsize_t, shinko_chcs9045_printsize);
+
+static void shinko_chcs9045_printer_init(stp_vars_t *v)
+{
+  char pg = '\0';
+  char sticker = '\0';
+
+  stp_zprintf(v, "\033CHC\n");
+  stp_put16_be(1, v);
+  stp_put16_be(1, v);
+  stp_put16_be(privdata.w_size, v);
+  stp_put16_be(privdata.h_size, v);
+  if (strcmp(privdata.pagesize,"B7") == 0)
+    pg = '\1';
+  else if (strcmp(privdata.pagesize,"w360h504") == 0)
+    pg = '\3';
+  else if (strcmp(privdata.pagesize,"w432h576") == 0)
+    pg = '\5';
+  else if (strcmp(privdata.pagesize,"w283h425") == 0)
+    sticker = '\3';
+  stp_putc(pg, v);
+  stp_putc('\0', v);
+  stp_putc(sticker, v);
+  dyesub_nputc(v, '\0', 4338);
+}
+
+
 
 /* Model capabilities */
 
@@ -1375,7 +1482,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
   },
   { /* Olympus P-S100 */
     20,
-    &rgb_ink_list,
+    &bgr_ink_list,
     &res_306dpi_list,
     &ps100_page_list,
     &ps100_printsize_list,
@@ -1420,7 +1527,8 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
     NULL,
   },
   { /* Canon CP-220, CP-330, SELPHY CP-400, SELPHY CP-500, SELPHY CP-510,
-       SELPHY CP-600, SELPHY CP-710 */
+       SELPHY CP-600, SELPHY CP-710, SELPHY CP-720, SELPHY CP-730,
+       SELPHY CP-740, SELPHY CP-750 */
     1001,
     &ymc_ink_list,
     &res_300dpi_list,
@@ -1436,6 +1544,22 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
     cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
     NULL,
   },
+  { /* Canon SELPHY ES1, ES2, ES20 (!experimental) */
+    1003,
+    &ymc_ink_list,
+    &res_300dpi_list,
+    &cpx00_page_list,
+    &cpx00_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS | DYESUB_FEATURE_WHITE_BORDER
+      | DYESUB_FEATURE_PLANE_INTERLACE,
+    &es1_printer_init_func, NULL,
+    &es1_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,
@@ -1553,6 +1677,20 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
     NULL, NULL, NULL,
     NULL,
   },
+  { /* Shinko CHC-S9045 (experimental) */
+    5000, 		
+    &rgb_ink_list,
+    &res_300dpi_list,
+    &shinko_chcs9045_page_list,
+    &shinko_chcs9045_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT,
+    &shinko_chcs9045_printer_init, NULL,
+    NULL, NULL,
+    NULL, NULL,
+    NULL, NULL, NULL,
+    NULL,
+  },
 };
 
 static const stp_parameter_t the_parameters[] =
@@ -1984,8 +2122,8 @@ dyesub_describe_resolution(const stp_vars_t *v, int *x, int *y)
 	{
 	  if (strcmp(resolution, r->item[i].name) == 0)
 	    {
-	      *x = r->item[i].xdpi;
-	      *y = r->item[i].ydpi;
+	      *x = r->item[i].w_dpi;
+	      *y = r->item[i].h_dpi;
 	      break;
 	    }
 	}
@@ -2147,7 +2285,7 @@ dyesub_print_pixel(stp_vars_t *v,
 {
   unsigned short ink[MAX_INK_CHANNELS * MAX_BYTES_PER_CHANNEL], *out;
   unsigned char *ink_u8;
-  int i, j;
+  int i, j, b;
   
   if (pv->print_mode == DYESUB_LANDSCAPE)
     { /* "rotate" image */
@@ -2186,7 +2324,10 @@ dyesub_print_pixel(stp_vars_t *v,
   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);
+/*  stp_zfwrite((char *) ink, pv->bytes_per_ink_channel, pv->ink_channels, v);*/
+      /* print inks in right order, eg. RGB  BGR */
+      for (b = 0; b < pv->ink_channels; b++)
+	stp_zfwrite((char *) ink + (pv->ink_order[b]-1), pv->bytes_per_ink_channel, 1, v);
 
   return 1;
 }
@@ -2226,11 +2367,11 @@ dyesub_print_plane(stp_vars_t *v,
     {
       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,
+	  privdata.block_min_h = h + pv->prnt_px;
+	  privdata.block_min_w = pv->prnl_px;
+	  privdata.block_max_h = MIN(h + pv->prnt_px + caps->block_size - 1,
 	  					pv->prnb_px);
-	  privdata.block_max_x = pv->prnr_px;
+	  privdata.block_max_w = pv->prnr_px;
 
 	  dyesub_exec(v, caps->block_init_func, "caps->block_init");
 	}
@@ -2261,7 +2402,7 @@ dyesub_print_plane(stp_vars_t *v,
 	    }
 	}
 
-      if (h + pv->prnt_px == privdata.block_max_y)
+      if (h + pv->prnt_px == privdata.block_max_h)
         { /* block end */
 	  dyesub_exec(v, caps->block_end_func, "caps->block_end");
 	}
@@ -2284,7 +2425,7 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
   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 */
+  int w_dpi, h_dpi;	/* Resolution */
 
   /* output in 1/72" */
   int out_pt_width  = stp_get_width(v);
@@ -2315,7 +2456,7 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
   pv.imgw_px = stp_image_width(image);
   pv.imgh_px = stp_image_height(image);
 
-  stp_describe_resolution(v, &xdpi, &ydpi);
+  stp_describe_resolution(v, &w_dpi, &h_dpi);
   dyesub_printsize(v, &max_print_px_width, &max_print_px_height);
 
   privdata.pagesize = stp_get_string_parameter(v, "PageSize");
@@ -2328,11 +2469,11 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
 	&page_mode);
   
   pv.prnw_px = MIN(max_print_px_width,
-		  	PX(page_pt_right - page_pt_left, xdpi));
+		  	PX(page_pt_right - page_pt_left, w_dpi));
   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);
+			PX(page_pt_bottom - page_pt_top, h_dpi));
+  pv.outw_px = PX(out_pt_width, w_dpi);
+  pv.outh_px = PX(out_pt_height, h_dpi);
 
 
   /* if image size is close enough to output size send out original size */
@@ -2343,9 +2484,9 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
 
   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.outl_px = MIN(PX(out_pt_left - page_pt_left, w_dpi),
 			pv.prnw_px - pv.outw_px);
-  pv.outt_px = MIN(PX(out_pt_top  - page_pt_top, ydpi),
+  pv.outt_px = MIN(PX(out_pt_top  - page_pt_top, h_dpi),
 			pv.prnh_px - pv.outh_px);
   pv.outr_px = pv.outl_px + pv.outw_px;
   pv.outb_px = pv.outt_px  + pv.outh_px;
@@ -2364,7 +2505,7 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
 	      "res (dpi)               %d x %d\n",
 	      page_pt_width, page_pt_height,
 	      pv.imgw_px, pv.imgh_px,
-	      PT(pv.imgw_px, xdpi), PT(pv.imgh_px, ydpi),
+	      PT(pv.imgw_px, w_dpi), PT(pv.imgh_px, h_dpi),
 	      out_pt_width, out_pt_height,
 	      pv.outw_px, pv.outh_px,
 	      out_pt_left, out_pt_top,
@@ -2372,14 +2513,9 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
 	      page_pt_right, page_pt_left, page_pt_right - page_pt_left,
 	      page_pt_bottom, page_pt_top, page_pt_bottom - page_pt_top,
 	      pv.prnw_px, pv.prnh_px,
-	      xdpi, ydpi
+	      w_dpi, h_dpi
 	      );	
 
-  privdata.xdpi = xdpi;
-  privdata.ydpi = ydpi;
-  privdata.xsize = pv.prnw_px;
-  privdata.ysize = pv.prnh_px;
-
 
   /* FIXME: move this into print_init_drv */
   ink_type = dyesub_describe_output_internal(v, &pv);
@@ -2450,6 +2586,13 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
       dyesub_swap_ints(&pv.imgh_px, &pv.imgw_px);
     }
 
+	/* assign private data *after* swaping image dimensions */
+  privdata.w_dpi = w_dpi;
+  privdata.h_dpi = h_dpi;
+  privdata.w_size = pv.prnw_px;
+  privdata.h_size = pv.prnh_px;
+  privdata.print_mode = pv.print_mode;
+
   /* printer init */
   dyesub_exec(v, caps->printer_init_func, "caps->printer_init");
 
@@ -2498,6 +2641,7 @@ static const stp_printfuncs_t print_dyesub_printfuncs =
   dyesub_describe_output,
   stp_verify_printer_params,
   NULL,
+  NULL,
   NULL
 };
 
diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c
index c428310..9a8fb2e 100644
--- a/src/main/print-pcl.c
+++ b/src/main/print-pcl.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-pcl.c,v 1.145 2006/09/12 19:03:33 easysw Exp $"
+ * "$Id: print-pcl.c,v 1.145.2.1 2007/12/15 20:35:49 rlk Exp $"
  *
  *   Print plug-in HP PCL driver for the GIMP.
  *
@@ -2219,8 +2219,6 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
           if ((strcmp(duplex_mode, "DuplexTumble") == 0))
             privdata.tumble=1;
         }
-      else
-        stp_erprintf("pcl: cannot duplex on this hardware.\n");
     }
 
  /*
@@ -2767,6 +2765,7 @@ static const stp_printfuncs_t print_pcl_printfuncs =
   pcl_describe_output,
   stp_verify_printer_params,
   NULL,
+  NULL,
   NULL
 };
 
diff --git a/src/main/print-ps.c b/src/main/print-ps.c
index 62b5437..3bff8a4 100644
--- a/src/main/print-ps.c
+++ b/src/main/print-ps.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-ps.c,v 1.87.8.1 2007/05/29 01:47:29 rlk Exp $"
+ * "$Id: print-ps.c,v 1.87.8.2 2007/12/15 20:35:49 rlk Exp $"
  *
  *   Print plug-in Adobe PostScript driver for the GIMP.
  *
@@ -1096,6 +1096,7 @@ static const stp_printfuncs_t print_ps_printfuncs =
   ps_describe_output,
   stp_verify_printer_params,
   NULL,
+  NULL,
   NULL
 };
 
diff --git a/src/main/print-raw.c b/src/main/print-raw.c
index b63f3d7..5f4c31f 100644
--- a/src/main/print-raw.c
+++ b/src/main/print-raw.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-raw.c,v 1.38 2006/04/17 02:06:19 rlk Exp $"
+ * "$Id: print-raw.c,v 1.38.8.1 2007/12/15 20:35:49 rlk Exp $"
  *
  *   Print plug-in RAW driver for the GIMP.
  *
@@ -332,6 +332,7 @@ static const stp_printfuncs_t print_raw_printfuncs =
   raw_describe_output,
   stp_verify_printer_params,
   NULL,
+  NULL,
   NULL
 };
 
diff --git a/src/main/print-util.c b/src/main/print-util.c
index 975ec65..e0ac696 100644
--- a/src/main/print-util.c
+++ b/src/main/print-util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-util.c,v 1.109.4.3 2007/06/04 00:25:16 rlk Exp $"
+ * "$Id: print-util.c,v 1.109.4.4 2007/12/15 20:35:49 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -342,12 +342,20 @@ stp_dprintf(unsigned long level, const stp_vars_t *v, const char *format, ...)
 {
   int bytes;
   stpi_init_debug();
-  if ((level & stpi_debug_level) && stp_get_errfunc(v))
+  if (level & stpi_debug_level)
     {
-      char *result;
-      STPI_VASPRINTF(result, bytes, format);
-      (stp_get_errfunc(v))((void *)(stp_get_errdata(v)), result, bytes);
-      stp_free(result);
+      if (stp_get_errfunc(v))
+	{
+	  char *result;
+	  STPI_VASPRINTF(result, bytes, format);
+	  (stp_get_errfunc(v))((void *)(stp_get_errdata(v)), result, bytes);
+	  stp_free(result);
+	} else {
+	  va_list args;
+	  va_start(args, format);
+	  vfprintf(stderr, format, args);
+	  va_end(args);
+	}
     }
 }
 
diff --git a/src/main/printers.c b/src/main/printers.c
index 9d56976..0820a22 100644
--- a/src/main/printers.c
+++ b/src/main/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.79.2.1 2007/05/29 01:47:30 rlk Exp $"
+ * "$Id: printers.c,v 1.79.2.2 2007/12/15 20:35:50 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -478,6 +478,17 @@ stp_end_job(const stp_vars_t *v, stp_image_t *image)
     return 1;
 }
 
+stp_string_list_t *
+stp_get_external_options(const stp_vars_t *v)
+{
+  const stp_printfuncs_t *printfuncs =
+    stpi_get_printfuncs(stp_get_printer(v));
+  if (printfuncs->get_external_options)
+    return (printfuncs->get_external_options)(v);
+  else
+    return NULL;
+}
+
 static int
 verify_string_param(const stp_vars_t *v, const char *parameter,
 		    stp_parameter_t *desc, int quiet)
diff --git a/src/main/printers.xml b/src/main/printers.xml
index b080e60..8250426 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.157.4.6 2007/06/17 12:37:13 faust3 Exp $"
+   "$Id: printers.xml,v 1.157.4.8 2007/12/29 20:42:28 rlk Exp $"
 -->
 
 <gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
@@ -39,7 +39,25 @@
         <parameter type="float" name="Gamma">0.75</parameter>
       </parameters>
       <parameters name="PIXMA_iP4000_params">
-        <parameter type="float" name="Gamma">0.4</parameter>
+        <parameter type="float" name="Gamma">0.60</parameter>
+      </parameters>
+      <parameters name="PIXMA_iP4200_params">
+        <parameter type="float" name="Brightness">1.30</parameter>
+        <parameter type="float" name="Gamma">0.70</parameter>
+        <parameter type="float" name="Density">0.80</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>
+      <parameters name="PIXMA_iX5000_params"> 
+        <parameter type="float" name="BlackGamma">2.0</parameter> 
+        <parameter type="float" name="YellowGamma">1.4</parameter> 
+        <parameter type="float" name="MagentaGamma">1.3</parameter> 
+        <parameter type="float" name="CyanGamma">1.3</parameter> 
       </parameters>
       <parameters name="PIXMA_iP4300_params">
         <parameter type="float" name="Brightness">0.7</parameter>
@@ -65,6 +83,8 @@
       <printer name="Canon BJC-4000" driver="bjc-4000" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
       <printer name="Canon BJC-4300" driver="bjc-4300" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
       <printer name="Canon BJC-4400" driver="bjc-4400" manufacturer="Canon" model="4400" parameters="density_800_params" />
+      <printer name="Canon BJC-5100" driver="bjc-5100" manufacturer="Canon" model="5100" parameters="density_800_params" />
+      <printer name="Canon BJC-5500" driver="bjc-5500" manufacturer="Canon" model="5500" parameters="density_800_params" />
       <printer name="Canon BJC-6000" driver="bjc-6000" manufacturer="Canon" model="6000" parameters="gamma_750_params" />
       <printer name="Canon BJC-6100" driver="bjc-6100" manufacturer="Canon" model="6100" parameters="density_800_params" />
       <printer name="Canon BJC-6200" driver="bjc-6200" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
@@ -72,42 +92,54 @@
       <printer name="Canon BJC-7000" driver="bjc-7000" manufacturer="Canon" model="7000" parameters="gamma_6_density_800_params" />
       <printer name="Canon BJC-7100" driver="bjc-7100" manufacturer="Canon" model="7100" parameters="density_800_params" />
       <printer name="Canon BJC-8200" driver="bjc-8200" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer name="Canon BJC-8500" driver="bjc-8500" manufacturer="Canon" model="8500" 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="8201" parameters="density_800_params" />
+      <printer name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="1000200" parameters="gamma_8_density_900_params" />
+      <printer name="Canon S300" driver="bjc-s300" manufacturer="Canon" model="1000300" 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" />
+      <printer name="Canon S500" driver="bjc-s500" manufacturer="Canon" model="1000500" parameters="density_800_params" />
       <printer name="Canon S600" driver="bjc-s600" manufacturer="Canon" model="8200" parameters="density_800_params" />
       <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 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" />
+      <printer name="Canon PIXMA iP2000" driver="bjc-PIXMA-iP2000" manufacturer="Canon" model="3002000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP3000" driver="bjc-PIXMA-iP3000" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP3100" driver="bjc-PIXMA-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP4000" driver="bjc-iP4000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP4100" driver="bjc-PIXMA-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP4200" driver="bjc-PIXMA-iP4200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4200_params" />
+      <printer name="Canon PIXMA iP4300" driver="bjc-PIXMA-iP4300" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4300_params" />
+      <printer name="Canon PIXMA iP4500" driver="bjc-PIXMA-iP4500" manufacturer="Canon" model="3004500" parameters="PIXMA_iP4300_params" />
+      <printer name="Canon PIXMA iP5000" driver="bjc-PIXMA-iP5000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP5200" driver="bjc-PIXMA-iP5200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP5300" driver="bjc-PIXMA-iP5300" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP6700" driver="bjc-PIXMA-iP6700" manufacturer="Canon" model="3006700" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP8500" driver="bjc-PIXMA-iP8500" manufacturer="Canon" model="3008500" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iX5000" driver="bjc-PIXMA-iX5000" manufacturer="Canon" model="4005000" parameters="PIXMA_iX5000_params" />
+      <printer name="Canon PIXMA Pro9500" driver="bjc-PIXMA-Pro9500" manufacturer="Canon" model="7009500" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP150" driver="bjc-MULTIPASS-MP150" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP170" driver="bjc-MULTIPASS-MP170" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP180" driver="bjc-MULTIPASS-MP180" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP500" driver="bjc-MULTIPASS-MP500" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP610" driver="bjc-MULTIPASS-MP610" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP700" driver="bjc-MULTIPASS-MP700" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP710" driver="bjc-MULTIPASS-MP710" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP730" driver="bjc-MULTIPASS-MP730" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP740" driver="bjc-MULTIPASS-MP740" manufacturer="Canon" model="5000740" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP750" driver="bjc-MULTIPASS-MP750" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP760" driver="bjc-MULTIPASS-MP760" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP770" driver="bjc-MULTIPASS-MP770" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP780" driver="bjc-MULTIPASS-MP780" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP790" driver="bjc-MULTIPASS-MP790" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP830" driver="bjc-MULTIPASS-MP830" manufacturer="Canon" model="5000830" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXUS iP3100" driver="bjc-PIXUS-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXUS iP4100" driver="bjc-PIXUS-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon i80" driver="bjc-i80"   manufacturer="Canon" model="2000080" parameters="density_800_params" />
+      <printer name="Canon i560" driver="bjc-i560" manufacturer="Canon" model="2000560" parameters="gamma_6_density_800_params" />
+      <printer name="Canon i850" driver="bjc-i850" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon i860" driver="bjc-i860" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon i865" driver="bjc-i865" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
     </family>
     <family name="escp2">
       <parameters name="standard_params">
@@ -172,6 +204,8 @@
       <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 C110" driver="escp2-c110" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer name="Epson Stylus C120" driver="escp2-c120" manufacturer="Epson" model="85" 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" />
       <printer name="Epson Stylus Color II" driver="escp2-ii" manufacturer="Epson" model="0" parameters="standard_params" />
@@ -266,6 +300,7 @@
       <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 RX595" driver="escp2-rx595" 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" />
@@ -297,32 +332,39 @@
       <printer name="Epson Stylus CX3810" driver="escp2-cx3810" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer name="Epson Stylus CX4100" driver="escp2-cx4100" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer name="Epson Stylus CX4200" driver="escp2-cx4200" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX4400" driver="escp2-cx4400" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer name="Epson Stylus CX4500" driver="escp2-cx4500" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <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 CX4900" driver="escp2-cx4900" 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 CX5600" driver="escp2-cx5600" manufacturer="Epson" model="72" parameters="standard_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 CX6300" driver="escp2-cx6300" manufacturer="Epson" model="79" 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 CX7400" driver="escp2-cx7400" 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="79" parameters="cx3500_params" />
       <printer name="Epson Stylus CX8400" driver="escp2-cx8400" manufacturer="Epson" model="79" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX9400" driver="escp2-cx9400" manufacturer="Epson" model="65" 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 D120" driver="escp2-d120" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer name="Epson Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer name="Epson Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer name="Epson Stylus DX4050" driver="escp2-dx4050" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer name="Epson Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer name="Epson Stylus DX4250" driver="escp2-dx4250" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer name="Epson Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="65" parameters="standard_params" />
@@ -353,6 +395,7 @@
       <printer name="Epson MJ 5100C" driver="escp2-mj5100c" manufacturer="Epson" model="39" parameters="standard_params" />
       <printer name="Epson MJ 6000C" driver="escp2-mj6000c" manufacturer="Epson" model="6" parameters="standard_params" />
       <printer name="Epson MJ 8000C" driver="escp2-mj8000c" manufacturer="Epson" model="24" parameters="standard_params" />
+      <printer name="Epson PM 670C" driver="escp2-pm670c" manufacturer="Epson" model="7" parameters="standard_params" />
       <printer name="Epson PM 700C" driver="escp2-pm700c" manufacturer="Epson" model="9" parameters="standard_params" />
       <printer name="Epson PM 730C" driver="escp2-pm730c" manufacturer="Epson" model="35" parameters="standard_params" />
       <printer name="Epson PM 740C" driver="escp2-pm740c" manufacturer="Epson" model="35" parameters="standard_params" />
@@ -407,6 +450,7 @@
       <printer name="Epson PX V500" driver="escp2-pxv500" manufacturer="Epson" model="61" parameters="standard_params" />
       <printer name="Epson PX V600" driver="escp2-pxv600" manufacturer="Epson" model="69" parameters="standard_params" />
       <printer name="Epson PX V630" driver="escp2-pxv630" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer name="Epson PX V780" driver="escp2-pxv780" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer name="Epson PX 5500" driver="escp2-px5500" manufacturer="Epson" model="71" parameters="standard_params" />
       <printer name="Epson PX 7000" driver="escp2-px7000" manufacturer="Epson" model="48" parameters="standard_params" />
       <printer name="Epson PX 9000" driver="escp2-px9000" manufacturer="Epson" model="49" parameters="standard_params" />
@@ -508,7 +552,7 @@
       <printer name="HP Color LaserJet 5000" driver="hp-clj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer name="HP Color LaserJet 5500" driver="hp-clj_5500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer name="HP Color LaserJet 8550GN" driver="hp-clj_8550gn" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP DesignJet 230" driver="pcl-desnj-230" manufacturer="HP" model="10230" parameters="pcl_inkjet_params" />
+     <printer name="HP DesignJet 230" driver="pcl-desnj-230" manufacturer="HP" model="10230" parameters="pcl_inkjet_params" />
       <printer name="HP DesignJet 250C" driver="pcl-desnj-250" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
       <printer name="HP DesignJet 430" driver="pcl-desnj-430" manufacturer="HP" model="10230" parameters="pcl_inkjet_params" />
       <printer name="HP DesignJet 450C" driver="pcl-desnj-450" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
@@ -638,6 +682,7 @@
       <printer name="HP LaserJet 1010" driver="hp-lj_1010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer name="HP LaserJet 1012" driver="hp-lj_1012" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer name="HP LaserJet 1015" driver="hp-lj_1015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer name="HP LaserJet 1022" driver="hp-lj_1022" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer name="HP LaserJet 1100" driver="hp-lj_1100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer name="HP LaserJet 1100A" driver="hp-lj_1100a" manufacturer="HP" model="6" parameters="pcl_laser_params" />
       <printer name="HP LaserJet 1150" driver="hp-lj_1150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
@@ -811,21 +856,21 @@
       <printer name="NEC SuperScript 1260" driver="nec-ssc_1260" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
       <printer name="NEC SuperScript 1400" driver="nec-ssc_1400" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
       <printer name="NEC SuperScript 1800" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata OL400" driver="okidata-ol400" manufacturer="Okidata" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL400e" driver="okidata-ol400e" manufacturer="Okidata" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL400ex" driver="okidata-ol400ex" manufacturer="Okidata" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL410e" driver="okidata-ol410e" manufacturer="Okidata" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata OL600e" driver="okidata-ol600e" manufacturer="Okidata" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL610e/S" driver="okidata-ol610e_s" manufacturer="Okidata" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL800" driver="okidata-ol800" manufacturer="Okidata" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL810ex" driver="okidata-ol810ex" manufacturer="Okidata" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 6e" driver="okidata-okp_6e" manufacturer="Okidata" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 6ex" driver="okidata-okp_6ex" manufacturer="Okidata" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 8p" driver="okidata-okp_8p" manufacturer="Okidata" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 10e" driver="okidata-okp_10e" manufacturer="Okidata" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 10ex" driver="okidata-okp_10ex" manufacturer="Okidata" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 14ex" driver="okidata-okp_14ex" manufacturer="Okidata" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Super 6e" driver="okidata-super_6e" manufacturer="Okidata" model="4" parameters="pcl_laser_params" />
+      <printer name="Okidata OL400" driver="okidata-ol400" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer name="Okidata OL400e" driver="okidata-ol400e" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer name="Okidata OL400ex" driver="okidata-ol400ex" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer name="Okidata OL410e" driver="okidata-ol410e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer name="Okidata OL600e" driver="okidata-ol600e" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer name="Okidata OL610e/S" driver="okidata-ol610e_s" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer name="Okidata OL800" driver="okidata-ol800" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer name="Okidata OL810ex" driver="okidata-ol810ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer name="Okidata Okipage 6e" driver="okidata-okp_6e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer name="Okidata Okipage 6ex" driver="okidata-okp_6ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer name="Okidata Okipage 8p" driver="okidata-okp_8p" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer name="Okidata Okipage 10e" driver="okidata-okp_10e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer name="Okidata Okipage 10ex" driver="okidata-okp_10ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer name="Okidata Okipage 14ex" driver="okidata-okp_14ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer name="Okidata Super 6e" driver="okidata-super_6e" manufacturer="Oki" model="4" parameters="pcl_laser_params" />
       <printer name="Olivetti JP350S" driver="olivetti-jp350s" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
       <printer name="Olivetti PG 306" driver="olivetti-pg_306" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
       <printer name="PCPI 1030" driver="pcpi-1030" manufacturer="PCPI" model="2" parameters="pcl_laser_params" />
@@ -850,6 +895,7 @@
       <printer name="Samsung QL-6050" driver="samsung-ql-6050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
       <printer name="Seiko SpeedJET 200" driver="seiko-sj_200" manufacturer="Seiko" model="2" parameters="pcl_laser_params" />
       <printer name="Sharp AR-161" driver="sharp-ar-161" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
+      <printer name="Sharp AR-M257" driver="sharp-ar-m257" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
       <printer name="Sony IJP-V100" driver="sony-ijp-v100" manufacturer="Sony" model="601" parameters="pcl_inkjet_params" />
       <printer name="Star LS-04" driver="star-ls-04" manufacturer="Star" model="2" parameters="pcl_laser_params" />
       <printer name="Star LaserPrinter 8" driver="star-lp_8" manufacturer="Star" model="2" parameters="pcl_laser_params" />
@@ -901,6 +947,13 @@
       <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="Canon SELPHY-CP-720" driver="canon-cp720" manufacturer="Canon" model="1001" />
+      <printer name="Canon SELPHY-CP-730" driver="canon-cp730" manufacturer="Canon" model="1001" />
+      <printer name="Canon SELPHY-CP-740" driver="canon-cp740" manufacturer="Canon" model="1001" />
+      <printer name="Canon SELPHY-CP-750" driver="canon-cp750" manufacturer="Canon" model="1001" />
+      <printer name="Canon SELPHY ES1" driver="canon-es1" manufacturer="Canon" model="1003" />
+      <printer name="Canon SELPHY ES2" driver="canon-es2" manufacturer="Canon" model="1003" />
+      <printer name="Canon SELPHY ES20" driver="canon-es20" manufacturer="Canon" model="1003" />
       <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" />
@@ -910,6 +963,7 @@
       <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"/>
+      <printer name="Shinko CHC-S9045" driver="shinko-chcs9045" manufacturer="Shinko" model="5000"/>
     </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 83f2b69..09cb116 100644
--- a/src/main/sequence.c
+++ b/src/main/sequence.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: sequence.c,v 1.23 2006/09/12 19:03:33 easysw Exp $"
+ * "$Id: sequence.c,v 1.23.2.1 2007/12/15 20:35:51 rlk Exp $"
  *
  *   Sequence data type.  This type is designed to be derived from by
  *   the curve and dither matrix types.
@@ -478,14 +478,13 @@ stp_sequence_set_##name##_data(stp_sequence_t *sequence,                     \
                                size_t count, const t *data)                  \
 {									     \
   int i;								     \
-  check_sequence(sequence);						             \
+  check_sequence(sequence);					             \
   if (count < 2)							     \
     return 0;								     \
 									     \
   /* Validate the data before we commit to it. */			     \
   for (i = 0; i < count; i++)						     \
-    if (! isfinite(data[i]) ||                                                 \
-        data[i] < sequence->blo ||                                           \
+    if (data[i] < sequence->blo ||                                           \
         data[i] > sequence->bhi)                                             \
       return 0;								     \
   stp_sequence_set_size(sequence, count);                                    \
@@ -494,7 +493,27 @@ stp_sequence_set_##name##_data(stp_sequence_t *sequence,                     \
   return 1;								     \
 }
 
-DEFINE_DATA_SETTER(float, float)
+int
+stp_sequence_set_float_data(stp_sequence_t *sequence,
+			    size_t count, const float *data)
+{
+  int i;
+  check_sequence(sequence);
+  if (count < 2)
+    return 0;
+
+  /* Validate the data before we commit to it. */
+  for (i = 0; i < count; i++)
+    if (! isfinite(data[i]) ||
+        data[i] < sequence->blo ||
+        data[i] > sequence->bhi)
+      return 0;
+  stp_sequence_set_size(sequence, count);
+  for (i = 0; i < count; i++)
+    stp_sequence_set_point(sequence, i, (double) data[i]);
+  return 1;
+}
+
 DEFINE_DATA_SETTER(long, long)
 DEFINE_DATA_SETTER(unsigned long, ulong)
 DEFINE_DATA_SETTER(int, int)
diff --git a/src/testpattern/Makefile.am b/src/testpattern/Makefile.am
index fa190ea..b0ec34a 100644
--- a/src/testpattern/Makefile.am
+++ b/src/testpattern/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.25 2006/05/28 19:17:26 rlk Exp $
+## $Id: Makefile.am,v 1.25.8.1 2007/12/15 20:35:51 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@ include $(top_srcdir)/scripts/global.mk
 
 pkgdatadir = $(datadir)/$(PACKAGE)/samples
 
-TESTS = run-testpattern run-testpattern-1 run-testpattern-2
+TESTS = run-testpattern-1 run-testpattern-2
 
 
 ## Programs
@@ -52,7 +52,9 @@ printer_options_LDADD = $(GUTENPRINT_LIBS)
 
 ## Data
 
+if INSTALL_SAMPLES
 pkgdata_DATA = testpattern.sample extended.sample
+endif
 
 
 ## Clean
diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in
index a58e6a2..1249030 100644
--- a/src/testpattern/Makefile.in
+++ b/src/testpattern/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -21,14 +21,10 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -68,32 +64,36 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 printer_options_SOURCES = printer_options.c
 printer_options_OBJECTS = printer_options.$(OBJEXT)
-am__DEPENDENCIES_1 = $(top_builddir)/src/main/libgutenprint.la
-printer_options_DEPENDENCIES = $(am__DEPENDENCIES_1)
+printer_options_DEPENDENCIES = $(GUTENPRINT_LIBS)
 printers_SOURCES = printers.c
 printers_OBJECTS = printers.$(OBJEXT)
-printers_DEPENDENCIES = $(am__DEPENDENCIES_1)
+printers_DEPENDENCIES = $(GUTENPRINT_LIBS)
 am_testpattern_OBJECTS = testpattern.$(OBJEXT) testpatterny.$(OBJEXT) \
 	testpatternl.$(OBJEXT)
 testpattern_OBJECTS = $(am_testpattern_OBJECTS)
-testpattern_DEPENDENCIES = $(am__DEPENDENCIES_1)
+testpattern_DEPENDENCIES = $(GUTENPRINT_LIBS)
 SCRIPTS = $(noinst_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 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) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
 LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
-LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+YLWRAP = $(top_srcdir)/scripts/ylwrap
+@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
 YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
-LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
-	$(AM_YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
 SOURCES = printer_options.c printers.c $(testpattern_SOURCES)
 DIST_SOURCES = printer_options.c printers.c $(testpattern_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -110,51 +110,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -164,8 +126,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -246,14 +206,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -273,9 +230,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -294,27 +250,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -326,6 +281,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -371,10 +327,13 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
-TESTS = run-testpattern run-testpattern-1 run-testpattern-2
+TESTS = run-testpattern-1 run-testpattern-2
 @BUILD_TESTPATTERN_TRUE@noinst_SCRIPTS = run-testpattern-2
 AM_LFLAGS = -i
 AM_YFLAGS = -d
@@ -382,7 +341,7 @@ testpattern_SOURCES = testpattern.c testpatterny.y testpatternl.l testpattern.h
 testpattern_LDADD = $(GUTENPRINT_LIBS)
 printers_LDADD = $(GUTENPRINT_LIBS)
 printer_options_LDADD = $(GUTENPRINT_LIBS)
-pkgdata_DATA = testpattern.sample extended.sample
+@INSTALL_SAMPLES_TRUE@pkgdata_DATA = testpattern.sample extended.sample
 MAINTAINERCLEANFILES = Makefile.in testpatternl.c testpatterny.c testpatterny.h
 EXTRA_DIST = testpatterny.h $(pkgdata_DATA) run-testpattern run-testpattern-1
 all: all-am
@@ -422,7 +381,7 @@ run-testpattern-2: $(top_builddir)/config.status $(srcdir)/run-testpattern-2.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -457,18 +416,18 @@ clean-noinstPROGRAMS:
 	done
 printer_options$(EXEEXT): $(printer_options_OBJECTS) $(printer_options_DEPENDENCIES) 
 	@rm -f printer_options$(EXEEXT)
-	$(LINK) $(printer_options_LDFLAGS) $(printer_options_OBJECTS) $(printer_options_LDADD) $(LIBS)
+	$(LINK) $(printer_options_OBJECTS) $(printer_options_LDADD) $(LIBS)
 printers$(EXEEXT): $(printers_OBJECTS) $(printers_DEPENDENCIES) 
 	@rm -f printers$(EXEEXT)
-	$(LINK) $(printers_LDFLAGS) $(printers_OBJECTS) $(printers_LDADD) $(LIBS)
+	$(LINK) $(printers_OBJECTS) $(printers_LDADD) $(LIBS)
 testpatterny.h: testpatterny.c
 	@if test ! -f $@; then \
 	  rm -f testpatterny.c; \
-	  $(MAKE) testpatterny.c; \
+	  $(MAKE) $(AM_MAKEFLAGS) testpatterny.c; \
 	else :; fi
 testpattern$(EXEEXT): $(testpattern_OBJECTS) $(testpattern_DEPENDENCIES) 
 	@rm -f testpattern$(EXEEXT)
-	$(LINK) $(testpattern_LDFLAGS) $(testpattern_OBJECTS) $(testpattern_LDADD) $(LIBS)
+	$(LINK) $(testpattern_OBJECTS) $(testpattern_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -483,64 +442,40 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpatterny.Po@am__quote@
 
 .c.o:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @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) $<
-	sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
-	rm -f $(LEX_OUTPUT_ROOT).c
+	$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
 
 .y.c:
-	$(YACCCOMPILE) $<
-	if test -f y.tab.h; then \
-	  to=`echo "$*_H" | sed \
-                -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
-                -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
-	  sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \
-            y.tab.h >$*.ht; \
-	  rm -f y.tab.h; \
-	  if cmp -s $*.ht $*.h; then \
-	    rm -f $*.ht ;\
-	  else \
-	    mv $*.ht $*.h; \
-	  fi; \
-	fi
-	if test -f y.output; then \
-	  mv y.output $*.output; \
-	fi
-	sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@
-	rm -f y.tab.c
+	$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(pkgdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -605,9 +540,9 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -616,7 +551,7 @@ check-TESTS: $(TESTS)
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -628,7 +563,7 @@ check-TESTS: $(TESTS)
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -678,23 +613,21 @@ check-TESTS: $(TESTS)
 	else :; fi
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -711,7 +644,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -750,7 +683,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -764,12 +697,20 @@ info-am:
 
 install-data-am: install-pkgdataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -790,22 +731,24 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-pkgdataDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-binPROGRAMS clean-generic clean-libtool \
 	clean-noinstPROGRAMS ctags 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-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pkgdataDATA install-strip installcheck installcheck-am \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgdataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-pkgdataDATA
+	uninstall-am uninstall-binPROGRAMS uninstall-pkgdataDATA
 
 
 @SET_MAKE@
diff --git a/src/testpattern/run-testpattern b/src/testpattern/run-testpattern
index 360c81a..f194323 100755
--- a/src/testpattern/run-testpattern
+++ b/src/testpattern/run-testpattern
@@ -16,6 +16,7 @@ valgrind=0
 valopts=''
 extra=''
 dontrun=
+output=''
 
 set_opt() {
     opt=`echo $1 | awk -F= '{print $1}'`
@@ -31,6 +32,7 @@ usage() {
     echo "Usage: run-testpattern [-v|--valgrind]"
     echo "                       [-p|--parameter parameter=value]"
     echo "                       [-n|--dontrun]"
+    echo "                       [-O|--output]"
     echo "                       [--] [printers...]"
     exit 0;
 }
@@ -43,6 +45,7 @@ set_args() {
 	    -c|--cachegrind) valopts='--tool=cachegrind'; valgrind=4 ;;
 	    -g|--gdb-attach) valopts='--gdb-attach=yes' ;;
 	    -p|--parameter) shift; set_opt "$1" ;;
+	    -O|--output) shift; output="$1" ;;
     	    -n|--dontrun) dontrun=1 ;;
 	    --) shift; args="$@"; return ;;
 	    *) return ;;
@@ -116,12 +119,16 @@ EOF
 }
 
 run_testpattern() {
+    suppress=-n
+    if [ -n "$output" ] ; then
+	suppress=''
+    fi
     case "$valgrind" in
-	1) valgrind $valopts -q --num-callers=100 --leak-check=yes ./testpattern -n ;;
-	2) valgrind $valopts --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes ./testpattern -n ;;
-	3) valgrind $valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes ./testpattern -n ;;
-	4) valgrind $valopts ./testpattern -n ;;
-	*) ./testpattern -n ;;
+	1) valgrind $valopts -q --num-callers=100 --leak-check=yes --error-limit=no ./testpattern $suppress ;;
+	2) valgrind $valopts --num-callers=100 --leak-resolution=high --leak-check=yes --error-limit=no ./testpattern $suppress ;;
+	3) valgrind $valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes ./testpattern $suppress ;;
+	4) valgrind $valopts ./testpattern $suppress ;;
+	*) ./testpattern $suppress ;;
     esac
     if [ $? -ne 0 ] ; then
 	retval=1
@@ -129,7 +136,7 @@ run_testpattern() {
     exit $retval
 }
 
-set_args `getopt hgvp:nc "$@"`
+set_args `getopt hgvp:ncO: "$@"`
 
 if [ -z "$args" ] ; then
     args=`./printers`
@@ -141,14 +148,25 @@ StandardDithers="EvenTone HybridEvenTone Adaptive Ordered Fast VeryFast Floyd Pr
 
 the_message=''
 
+if [ -z "$dontrun" -a -n "$output" -a ! -d "$output" ] ; then
+    mkdir "$output"
+    if [ "$?" -ne 0 ] ; then
+	echo "Cannot create directory '$output'"
+	exit 1
+    fi
+fi
+
 print_all_testpatterns() {
     if [ -z "`echo $extra |grep DitherAlgorithm`" ] ; then
 	for p in $args ; do
 	    set_message "$p
 "
 	    for d in $StandardDithers ; do
+		if [ -n "$output" ] ; then
+		    outstuff="`printf '\n%s\n' \"output \\\"$output/${p}_${d}\\\";\"`"
+		fi
 		set_message "    $d"
-		print_one_testpattern "$p" "`printf '%s\n' \"parameter \\\"DitherAlgorithm\\\" \\\"$d\\\";\"`" "$extra" "$the_message"
+		print_one_testpattern "$p" "`printf '%s\n' \"parameter \\\"DitherAlgorithm\\\" \\\"$d\\\";\"`" "$extra" "$the_message" "$outstuff"
 		the_message=''
 	    done
 	done
diff --git a/src/testpattern/run-testpattern-1 b/src/testpattern/run-testpattern-1
index 466a476..f606235 100755
--- a/src/testpattern/run-testpattern-1
+++ b/src/testpattern/run-testpattern-1
@@ -16,6 +16,7 @@ valgrind=0
 valopts=''
 extra=''
 dontrun=
+output=
 
 set_opt() {
     opt=`echo $1 | awk -F= '{print $1}'`
@@ -31,6 +32,7 @@ usage() {
     echo "Usage: run-testpattern [-v|--valgrind]"
     echo "                       [-p|--parameter parameter=value]"
     echo "                       [-n|--dontrun]"
+    echo "                       [-O|--output]"
     echo "                       [--] [printers...]"
     exit 0;
 }
@@ -46,6 +48,7 @@ set_args() {
 	    -g|--gdb-attach) valopts='--gdb-attach=yes' ;;
 	    -p|--parameter) shift; set_opt "$1" ;;
     	    -n|--dontrun) dontrun=1 ;;
+	    -O|--output) shift; output="$1" ;;
 	    -o|--one) print_command=run_testpattern; dontrun=1 ;;
 	    --) shift; args="$@"; return ;;
 	    *) return ;;
@@ -207,13 +210,16 @@ EOF
 }
 
 run_testpattern() {
+    suppress=-n
+    if [ -n "$output" ] ; then
+	suppress=''
+    fi
     case "$valgrind" in
-	1) valgrind $valopts -q --num-callers=100 --leak-check=yes ./testpattern -n ;;
-	2) valgrind $valopts --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes ./testpattern -n ;;
-	3) valgrind $valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes ./testpattern -n ;;
-	4) valgrind $valopts ./testpattern -n ;;
-	5) LD_PRELOAD=libefence.so.0.0 ./testpattern -n ;;
-	*) ./testpattern -n ;;
+	1) valgrind $valopts -q --num-callers=100 --leak-check=yes --error-limit=no ./testpattern $suppress ;;
+	2) valgrind $valopts --num-callers=100 --leak-resolution=high --leak-check=yes --error-limit=no ./testpattern $suppress ;;
+	3) valgrind $valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes ./testpattern $suppress ;;
+	4) valgrind $valopts ./testpattern $suppress ;;
+	*) ./testpattern $suppress ;;
     esac
     if [ $? -ne 0 ] ; then
 	retval=1
@@ -221,7 +227,7 @@ run_testpattern() {
     exit $retval
 }
 
-set_args `getopt hgvp:nco "$@"`
+set_args `getopt hgvp:ncoO: "$@"`
 
 if [ -z "$args" ] ; then
     args=`./printers`
@@ -238,18 +244,29 @@ RawTypes="raw-data-8 raw-data-16"
 RawModes="rgb kcmy cmyk cmy gray white"
 RawColorCorrections="None Density Desaturated Accurate Bright Uncorrected Threshold Raw Predithered"
 RawInkTypes="CMYK RGB CMY KCMY RGBGray CMYGray"
-RawPrintingModes="Color BW"
+RawPrintingModes="BW Color"
 
 the_message=''
 
+if [ -z "$dontrun" -a -n "$output" -a ! -d "$output" ] ; then
+    mkdir "$output"
+    if [ "$?" -ne 0 ] ; then
+	echo "Cannot create directory '$output'"
+	exit 1
+    fi
+fi
+
 print_all_testpatterns() {
     for a in $RawPrintingModes ; do
 	for b in $RawInkTypes ; do
 	    for c in $RawColorCorrections ; do
 		for d in $RawModes ; do
 		    for e in $RawBitDepths ; do
-			set_message "$a $b $c $d $e"
-			print_one_raw_testpattern "raw-data-8" $d $e $b $c $a "$extra" "$the_message" | $print_command
+			set_message "Raw $a $b $c $d $e"
+			if [ -n "$output" ] ; then
+			    outstuff="`printf '\n%s\n' \"output \\\"$output/raw-data-8_${a}_${b}_${c}_${d}_${e}\\\";\"`"
+			fi
+			print_one_raw_testpattern "raw-data-8" $d $e $b $c $a "$extra" "$the_message" "$outstuff"| $print_command
 			the_message=""
 		    done
 		done
@@ -261,8 +278,11 @@ print_all_testpatterns() {
 	    for c in $StandardColorCorrections ; do
 		for d in $StandardModes ; do
 		    for e in $StandardBitDepths ; do
-			set_message "$a $b $c $d $e"
-			print_one_testpattern "escp2-r800" $d $e $b $c $a "$extra" "$the_message" | $print_command
+			set_message "R800 $a $b $c $d $e"
+			if [ -n "$output" ] ; then
+			    outstuff="`printf '\n%s\n' \"output \\\"$output/escp2-r800_${a}_${b}_${c}_${d}_${e}\\\";\"`"
+			fi
+			print_one_testpattern "escp2-r800" $d $e $b $c $a "$extra" "$the_message" "$outstuff" | $print_command
 			the_message=""
 		    done
 		done
@@ -271,8 +291,11 @@ print_all_testpatterns() {
     done
     for a in $StandardColorCorrections ; do
 	for b in $StandardBitDepths ; do
-	    set_message "Color extended 8 CMYKRB $a $b"
-	    print_one_testpattern "escp2-r800" "extended 8" $b CMYKRB $a Color "$extra" "$the_message" | $print_command
+	    set_message "R800 Extended Color 8 CMYKRB $a $b"
+	    if [ -n "$output" ] ; then
+		outstuff="`printf '\n%s\n' \"output \\\"$output/escp2-r800_${b}_CMYKRB_${a}_Color\\\";\"`"
+	    fi
+	    print_one_testpattern "escp2-r800" "extended 8" $b CMYKRB $a Color "$extra" "$the_message" "$outstuff" | $print_command
 	    the_message=""
 	done
     done
diff --git a/src/testpattern/run-testpattern-2.in b/src/testpattern/run-testpattern-2.in
index 9f0fd5c..065d8f4 100644
--- a/src/testpattern/run-testpattern-2.in
+++ b/src/testpattern/run-testpattern-2.in
@@ -14,29 +14,54 @@ my $retval = 0;
 my $testpattern_command;
 my @printer_list = ();
 my @special_options = ();
-my @standard_options = qw(InkType);
+my @standard_options = qw(InkType DitherAlgorithm Duplex);
 my $global_status = 1;
+my $output = undef;
 
 my @extras = ();
 my @messages = ();
+my @global_messages = ();
 my %stpdata = ();
 my %models_found = ();
 my %models;
 my %families;
 my $skip_duplicate_printers = 0;
+my $std_pages = 1;
+
+my @default_options = ();
+my %base_settings = ("DitherAlgorithm" => "Fast",
+		     "ColorCorrection" => "Raw");
 
 GetOptions("v+"  => \$valgrind,
 	   "c"   => \$cachegrind,
 	   "g"   => \$gdb_attach,
 	   "n"   => \$dontrun,
+	   "p:i" => \$std_pages,
 	   "s!"  => \$skip_duplicate_printers,
 	   "o=s" => \@special_options,
-	   "m"   => \$calc_md5);
+	   "O=s" => \$output,
+	   "d=s" => \@default_options,
+	   "m:s" => \$calc_md5);
+
+my $pages = $std_pages;
+
+if (defined $calc_md5 && $calc_md5 eq "0") {
+    $calc_md5 = undef;
+}
 
 if (! @special_options) {
     @special_options = @standard_options;
 }
 
+foreach my $opt (@default_options) {
+    my ($option, $value) = split(/=/, $opt);
+    if (! $value) {
+	delete $base_settings{$option};
+    } else {
+	$base_settings{$option} = $value;
+    }
+}
+
 my $pwd = `pwd`;
 chomp $pwd;
 
@@ -58,11 +83,22 @@ sub set_message($) {
     push @messages, "message \"$message\";\n";
 }
 
+sub set_global_message($) {
+    my ($message) = @_;
+    push @global_messages, "message \"$message\";\n";
+}
+
 sub print_one_testpattern($) {
     my ($printer) = @_;
-    my $stuff = "printer \"$printer\";\n";
-    $stuff .= join "", @extras, @messages;
-    $stuff .= << 'EOF';
+    my $stuff = join "", @global_messages;
+    foreach my $page (0..$pages - 1) {
+    	$stuff .= "printer \"$printer\";\n";
+	$stuff .= join "", @extras, @messages;
+	if ($pages > 1) {
+	    $stuff .= "message \"(page $page)\";\n";
+	}
+	$stuff .= "parameter_int \"PageNumber\" $page;\n";
+	$stuff .= << 'EOF';
 hsize 0.1;
 vsize 0.1;
 left 0.15;
@@ -118,6 +154,7 @@ pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.9 1.0  0.0 0.1 1.0 0.0 0.1 1.0 0.0 0.0 1.0;
 pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.9 1.0  0.0 0.1 1.0 0.0 0.1 1.0 0.0 0.0 1.0;
 end;
 EOF
+    }
     return $stuff;
 }
 
@@ -146,14 +183,6 @@ 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;
     }
@@ -197,17 +226,38 @@ sub do_printer {
     my $pmode;
     foreach $pmode (@printing_modes) {
 	my ($resolution);
+	$pages = $std_pages;
 	foreach $resolution (@resolutions) {
 	    @extras = ();
 	    @messages = ();
+	    @global_messages = ();
 	    if ($first_time) {
-		set_message("$printer\n");
+		set_global_message("$printer\n");
 		$first_time = 0;
 	    }
 	    set_opt("PrintingMode", $pmode);
 	    set_opt("Resolution", $resolution);
-	    set_opt("DitherAlgorithm", "Fast");
-	    set_opt("ColorCorrection", "Raw");
+	    map { set_opt($_, $base_settings{$_})} keys %base_settings;
+	    if (defined $output || defined $calc_md5) {
+		my $outkey = "${printer}_PrintingMode_${pmode}_Resolution_${resolution}";
+		my $md5_dir = $calc_md5;
+		if (defined $calc_md5 && $calc_md5 eq "") {
+		    $md5_dir = $output;
+		}
+		my $outbase = "${outkey}.prn";
+		my $outfile = "$output/$outbase";
+		my $md5file = "$md5_dir/${outkey}.md5";
+		if (! $md5_dir) {
+		    $md5file = "${outkey}.md5";
+		}
+		if ($output && $calc_md5) {
+		    push @extras, "output \"|tee '$outfile' | md5sum -b | sed 's/-/$outbase/' > '$md5file'\";\n";
+		} elsif ($output) {
+		    push @extras, "output \"$outfile\";\n";
+		} else {
+		    push @extras, "output \"|md5sum -b | sed 's/-/$outbase/' > '$md5file'\";\n";
+		}
+	    }
 	    set_message("    ${pmode}+${resolution}");
 	    my $output = print_one_testpattern($printer);
 	    do_print( $output, $fh );
@@ -218,17 +268,48 @@ sub do_printer {
 	    if ($#opts >= 1) {
 		my $opt;
 		foreach $opt (@opts) {
+		    my ($out_file);
 		    @extras = ();
 		    @messages = ();
+		    @global_messages = ();
 		    if ($first_time) {
-			set_message("$printer\n");
+			set_global_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");
+		    map {
+			if ($key ne $_) {
+			    set_opt($_, $base_settings{$_});
+			    if ($key eq "Duplex") {
+				set_opt("JobMode", "Job");
+				$pages = 4;
+			    } else {
+				$pages = $std_pages;
+			    }
+			}
+		    } keys %base_settings;
+		    if (defined $output || defined $calc_md5) {
+			my $outkey = "${printer}_PrintingMode_${pmode}_Resolution_${min_res_name}_${key}_${opt}";
+			my $md5_dir = $calc_md5;
+			if (defined $calc_md5 && $calc_md5 eq "") {
+			    $md5_dir = $output;
+			}
+			my $outbase = "${outkey}.prn";
+			my $outfile = "$output/$outbase";
+			my $md5file = "$md5_dir/${outkey}.md5";
+			if (! $md5_dir) {
+			    $md5file = "${outkey}.md5";
+			}
+			if (defined $output && defined $calc_md5) {
+			    push @extras, "output \"|tee '$outfile' | md5sum -b | sed 's/-/$outbase/' > '$md5file'\";\n";
+			} elsif ($output) {
+			    push @extras, "output \"$outfile\";\n";
+			} else {
+			    push @extras, "output \"|md5sum -b | sed 's/-/$outbase/' > '$md5file'\";\n";
+			}
+		    }
 		    set_message("    ${key}=${opt}+${pmode}+${min_res_name}");
 		    my $output = print_one_testpattern($printer);
 		    do_print( $output, $fh );
@@ -263,19 +344,22 @@ if ($dontrun) {
 	$valgrind_command = "valgrind $valopts";
     }
 
-    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 (defined $output && $output ne "" && ! -d $output) {
+	mkdir $output || die "Can't create directory $output: $!\n";
+    }
+
+    if (defined $calc_md5 && $calc_md5 ne "" && ! -d $calc_md5) {
+	mkdir $calc_md5 || die "Can't create directory $calc_md5: $!\n";
     }
+
+    my $status = 1;
+    my ($suppress);
+    if (! defined $output && ! defined $calc_md5) { $suppress = '-n'; }
+    $testpattern_command = "$valgrind_command ./testpattern $suppress";
+    open TESTPATTERN, "|$testpattern_command" or
+	die "Can't run $testpattern_command: $!\n";
+    map { do_printer($_, \*TESTPATTERN) } @printer_list;
+    $status = close TESTPATTERN;
     if ($status) {
 	exit 0;
     } else {
diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c
index db7fe2f..29c30b1 100644
--- a/src/testpattern/testpattern.c
+++ b/src/testpattern/testpattern.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpattern.c,v 1.44 2006/04/18 12:30:57 rlk Exp $"
+ * "$Id: testpattern.c,v 1.44.8.2 2007/12/31 03:37:27 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -40,6 +40,7 @@
 #include <string.h>
 #include "testpattern.h"
 #include <gutenprint/gutenprint-intl.h>
+#include <errno.h>
 
 extern int yyparse(void);
 
@@ -87,6 +88,7 @@ int global_invert_data = 0;
 int global_use_raw_cmyk;
 int global_did_something;
 int global_suppress_output = 0;
+char *global_output = NULL;
 
 static testpattern_t *static_testpatterns;
 
@@ -171,6 +173,8 @@ static void
 writefunc(void *file, const char *buf, size_t bytes)
 {
   FILE *prn = (FILE *)file;
+  if (! file)
+    return;
   if (!global_suppress_output || (file == stderr))
     {
       fwrite(buf, 1, bytes, prn);
@@ -232,6 +236,8 @@ do_print(void)
   int count;
   int i;
   char tmp[32];
+  FILE *output = stdout;
+  int write_to_process = 0;
 
   initialize_global_parameters();
   global_vars = stp_vars_create();
@@ -264,10 +270,42 @@ do_print(void)
 	}
       return 2;
     }
+  if (global_output)
+    {
+      if (strcmp(global_output, "-") == 0)
+	output = stdout;
+      else if (strcmp(global_output, "") == 0)
+	output = NULL;
+      else if (global_output[0] == '|')
+	{
+	  write_to_process = 1;
+	  output = popen(global_output+1, "w");
+	  if (! output)
+	    {
+	      fprintf(stderr, "popen '%s' failed: %s\n", global_output, strerror(errno));
+	      output = NULL;
+	    }
+	  free(global_output);
+	  global_output = NULL;
+	}
+      else
+	{
+	  output = fopen(global_output, "wb");
+	  if (! output)
+	    {
+	      fprintf(stderr, "Create %s failed: %s\n", global_output, strerror(errno));
+	      output = NULL;
+	    }
+	  free(global_output);
+	  global_output = NULL;
+	}
+    }
+  else
+    output = stdout;
   stp_set_printer_defaults(v, the_printer);
   stp_set_outfunc(v, writefunc);
   stp_set_errfunc(v, writefunc);
-  stp_set_outdata(v, stdout);
+  stp_set_outdata(v, output);
   stp_set_errdata(v, stderr);
   stp_set_string_parameter(v, "InputImageType", global_image_type);
   sprintf(tmp, "%d", global_bit_depth);
@@ -286,12 +324,29 @@ do_print(void)
   for (i = 0; i < count; i++)
     {
       const stp_parameter_t *p = stp_parameter_list_param(params, i);
-      const char *val = stp_get_string_parameter(global_vars, p->name);
-      if (p->p_type == STP_PARAMETER_TYPE_STRING_LIST && val && strlen(val) > 0)
-	stp_set_string_parameter(v, p->name, val);
-      stp_set_page_width(v, stp_get_page_width(global_vars));
-      stp_set_page_height(v, stp_get_page_height(global_vars));
+      if (p->p_type == STP_PARAMETER_TYPE_STRING_LIST)
+	{
+	  const char *val = stp_get_string_parameter(global_vars, p->name);
+	  if (val && strlen(val) > 0)
+	    {
+	      stp_set_string_parameter(v, p->name, val);
+	    }
+	}
+      else if (p->p_type == STP_PARAMETER_TYPE_INT &&
+	       stp_check_int_parameter(global_vars, p->name, STP_PARAMETER_ACTIVE))
+	{
+	  int val = stp_get_int_parameter(global_vars, p->name);
+	  stp_set_int_parameter(v, p->name, val);
+	}
+      else if (p->p_type == STP_PARAMETER_TYPE_DOUBLE &&
+	       stp_check_float_parameter(global_vars, p->name, STP_PARAMETER_ACTIVE))
+	{
+	  double val = stp_get_float_parameter(global_vars, p->name);
+	  stp_set_float_parameter(v, p->name, val);
+	}
     }
+  stp_set_page_width(v, stp_get_page_width(global_vars));
+  stp_set_page_height(v, stp_get_page_height(global_vars));
   stp_parameter_list_destroy(params);
 
   stp_get_imageable_area(v, &left, &right, &bottom, &top);
@@ -328,6 +383,13 @@ do_print(void)
   stp_vars_destroy(v);
   stp_free(static_testpatterns);
   static_testpatterns = NULL;
+  if (output && output != stdout)
+    {
+      if (write_to_process)
+	(void) pclose(output);
+      else
+	(void) fclose(output);
+    }
   return 0;
 }
 
@@ -384,6 +446,8 @@ fill_black_##bits(unsigned char *data, size_t len, size_t scount)	\
   int i;								\
   T *s_data = (T *) data;						\
   unsigned black_val = global_ink_limit * ((1 << bits) - 1);		\
+  unsigned blocks = (len / scount) * scount;				\
+  unsigned extra = len - blocks;					\
   if (strcmp(global_image_type, "Raw") == 0)				\
     {									\
       for (i = 0; i < (len / scount) * scount; i++)			\
@@ -402,6 +466,28 @@ fill_black_##bits(unsigned char *data, size_t len, size_t scount)	\
 	    }								\
 	  s_data += global_channel_depth;				\
 	}								\
+      memset(s_data, 0xff, sizeof(T) * extra *				\
+	     global_channel_depth);					\
+    }									\
+  else if (strcmp(global_image_type, "RGB") == 0)			\
+    {									\
+      for (i = 0; i < (len / scount) * scount; i++)			\
+	{								\
+	  memset(s_data, 0, sizeof(T) * 3);				\
+	  s_data += 3;							\
+	}								\
+      memset(s_data, 0xff, sizeof(T) * extra * 3);			\
+    }									\
+  else if (strcmp(global_image_type, "CMY") == 0)			\
+    {									\
+      for (i = 0; i < (len / scount) * scount; i++)			\
+	{								\
+	  s_data[0] = black_val;					\
+	  s_data[1] = black_val;					\
+	  s_data[2] = black_val;					\
+	  s_data += 3;							\
+	}								\
+      memset(s_data, 0, sizeof(T) * extra * 3);				\
     }									\
   else if (strcmp(global_image_type, "CMYK") == 0)			\
     {									\
@@ -411,6 +497,7 @@ fill_black_##bits(unsigned char *data, size_t len, size_t scount)	\
 	  s_data[3] = black_val;					\
 	  s_data += 4;							\
 	}								\
+      memset(s_data, 0, sizeof(T) * extra * 4);				\
     }									\
   else if (strcmp(global_image_type, "KCMY") == 0)			\
     {									\
@@ -420,6 +507,7 @@ fill_black_##bits(unsigned char *data, size_t len, size_t scount)	\
 	  s_data[0] = black_val;					\
 	  s_data += 4;							\
 	}								\
+      memset(s_data, 0, sizeof(T) * extra * 4);				\
     }									\
   else if (strcmp(global_image_type, "Grayscale") == 0)			\
     {									\
@@ -429,6 +517,16 @@ fill_black_##bits(unsigned char *data, size_t len, size_t scount)	\
 	  s_data[0] = black_val;					\
 	  s_data += 1;							\
 	}								\
+      memset(s_data, 0, sizeof(T) * extra);				\
+    }									\
+  else if (strcmp(global_image_type, "Whitescale") == 0)		\
+    {									\
+      for (i = 0; i < (len / scount) * scount; i++)			\
+	{								\
+	  memset(s_data, 0, sizeof(T) * 1);				\
+	  s_data += 1;							\
+	}								\
+      memset(s_data, 0xff, sizeof(T) * extra);				\
     }									\
 }
 
@@ -455,9 +553,64 @@ fill_black(unsigned char *data, size_t len, size_t scount, size_t bytes)
 static void								\
 fill_white_##bits(unsigned char *data, size_t len, size_t scount)	\
 {									\
+  int i;								\
   T *s_data = (T *) data;						\
-  memset(s_data, 0, sizeof(T) * global_channel_depth *			\
-	 ((len / scount) * scount));					\
+  if (strcmp(global_image_type, "Raw") == 0)				\
+    {									\
+      for (i = 0; i < len; i++)						\
+	{								\
+	  memset(s_data, 0, sizeof(T) * global_channel_depth);		\
+	  s_data += global_channel_depth;				\
+	}								\
+    }									\
+  else if (strcmp(global_image_type, "RGB") == 0)			\
+    {									\
+      for (i = 0; i < len; i++)						\
+	{								\
+	  memset(s_data, 0xff, sizeof(T) * 3);				\
+	  s_data += 3;							\
+	}								\
+    }									\
+  else if (strcmp(global_image_type, "CMY") == 0)			\
+    {									\
+      for (i = 0; i < len; i++)						\
+	{								\
+	  memset(s_data, 0, sizeof(T) * 3);				\
+	  s_data += 3;							\
+	}								\
+    }									\
+  else if (strcmp(global_image_type, "CMYK") == 0)			\
+    {									\
+      for (i = 0; i < len; i++)						\
+	{								\
+	  memset(s_data, 0, sizeof(T) * 4);				\
+	  s_data += 4;							\
+	}								\
+    }									\
+  else if (strcmp(global_image_type, "KCMY") == 0)			\
+    {									\
+      for (i = 0; i < len; i++)						\
+	{								\
+	  memset(s_data, 0, sizeof(T) * 4);				\
+	  s_data += 4;							\
+	}								\
+    }									\
+  else if (strcmp(global_image_type, "Grayscale") == 0)			\
+    {									\
+      for (i = 0; i < len; i++)						\
+	{								\
+	  memset(s_data, 0, sizeof(T) * 1);				\
+	  s_data += 1;							\
+	}								\
+    }									\
+  else if (strcmp(global_image_type, "Whitescale") == 0)		\
+    {									\
+      for (i = 0; i < len; i++)						\
+	{								\
+	  memset(s_data, 0xff, sizeof(T) * 1);				\
+	  s_data += 1;							\
+	}								\
+    }									\
 }
 
 FILL_WHITE_FUNCTION(unsigned short, 16)
@@ -844,6 +997,10 @@ Image_get_row(stp_image_t *image, unsigned char *data,
 	  previous_band = band;
 	  fprintf(stderr, ".");
 	}
+      else
+	fill_pattern(&(static_testpatterns[band]), data,
+		     global_printer_width, global_steps, depth,
+		     global_bit_depth / 8);
     }
   return STP_IMAGE_STATUS_OK;
 }
diff --git a/src/testpattern/testpattern.h b/src/testpattern/testpattern.h
index 8b288a2..6b0fc83 100644
--- a/src/testpattern/testpattern.h
+++ b/src/testpattern/testpattern.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpattern.h,v 1.15 2004/09/17 18:38:27 rleigh Exp $"
+ * "$Id: testpattern.h,v 1.15.18.1 2007/12/15 20:35:52 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -25,6 +25,7 @@
 #endif
 
 #include <gutenprint/gutenprint.h>
+#include <stdio.h>
 
 typedef struct
 {
@@ -80,6 +81,7 @@ extern int global_bit_depth;
 extern int global_channel_depth;
 extern int global_did_something;
 extern int global_invert_data;
+extern char *global_output;
 
 
 extern char *c_strdup(const char *s);
diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c
index ad2e0c6..3cfa272 100644
--- a/src/testpattern/testpatternl.c
+++ b/src/testpattern/testpatternl.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 "testpatternl.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,99 +287,120 @@ 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 49
-#define YY_END_OF_BUFFER 50
-static yyconst short int yy_accept[233] =
+#define YY_NUM_RULES 50
+#define YY_END_OF_BUFFER 51
+/* 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[239] =
     {   0,
-        0,    0,   50,   49,   46,   48,   49,   47,   49,   49,
-       43,   32,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   46,    0,   47,    0,   45,   43,   45,    0,   43,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,    0,
-       44,    0,   45,   44,   45,   45,   37,   45,   45,   45,
-       42,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-
-       45,   45,   36,   45,   20,   45,   45,   45,   45,   44,
-       45,   45,   34,    1,   45,   45,   45,   45,   39,   38,
-       29,   45,   45,   45,   35,   45,   45,   45,   21,   45,
-       45,   45,   33,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,    7,   45,   45,   45,   45,    9,   22,   27,
-       45,   45,   45,   45,   10,   45,   45,   45,   45,   45,
-       45,   11,   23,   40,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,    2,   45,   45,   45,   45,   45,   45,
-       45,   45,    5,   45,   30,   45,   19,   45,   45,    8,
-       45,    3,   41,   45,   45,   25,   13,   45,   45,    6,
-
-       28,   45,   45,   45,   45,   26,   24,   12,    4,   31,
-       14,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   15,   45,   45,   45,   45,   18,   17,   45,
-       16,    0
+        0,    0,   51,   50,   47,   49,   50,   48,   50,   50,
+       44,   32,   46,   46,   46,   46,   46,   46,   46,   46,
+       46,   46,   46,   46,   46,   46,   46,   46,   46,   46,
+       46,   46,   47,    0,   48,    0,   46,   44,   46,    0,
+       44,   46,   46,   46,   46,   46,   46,   46,   46,   46,
+       46,   46,   46,   46,   46,   46,   46,   46,   46,   46,
+       46,   46,   46,   46,   46,   46,   46,   46,   46,   46,
+       46,    0,   45,    0,   46,   45,   46,   46,   37,   46,
+       46,   46,   43,   46,   46,   46,   46,   46,   46,   46,
+       46,   46,   46,   46,   46,   46,   46,   46,   46,   46,
+
+       46,   46,   46,   46,   46,   36,   46,   20,   46,   46,
+       46,   46,   45,   46,   46,   34,    1,   46,   46,   46,
+       46,   39,   38,   29,   46,   46,   46,   35,   46,   46,
+       46,   21,   46,   46,   46,   33,   46,   46,   46,   46,
+       46,   46,   46,   46,   46,   46,    7,   46,   46,   46,
+       46,    9,   22,   27,   46,   46,   46,   46,   10,   46,
+       46,   46,   46,   46,   46,   46,   11,   23,   40,   46,
+       46,   46,   46,   46,   46,   46,   46,   46,    2,   46,
+       46,   46,   41,   46,   46,   46,   46,   46,    5,   46,
+       30,   46,   19,   46,   46,    8,   46,    3,   42,   46,
+
+       46,   25,   13,   46,   46,    6,   28,   46,   46,   46,
+       46,   26,   24,   12,    4,   31,   14,   46,   46,   46,
+       46,   46,   46,   46,   46,   46,   46,   46,   15,   46,
+       46,   46,   46,   18,   17,   46,   16,    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,
@@ -349,7 +432,7 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[38] =
+static yyconst flex_int32_t yy_meta[38] =
     {   0,
         1,    1,    2,    3,    1,    1,    1,    4,    4,    4,
         1,    4,    4,    4,    4,    4,    4,    4,    4,    4,
@@ -357,127 +440,130 @@ static yyconst int yy_meta[38] =
         4,    4,    4,    4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[237] =
+static yyconst flex_int16_t yy_base[243] =
     {   0,
-        0,    0,  468,  469,  465,  469,    0,    0,  460,  455,
-       29,  469,  455,   31,   32,   33,   34,   35,   40,   47,
-       38,   42,   49,   52,   58,   54,   62,   65,   66,   69,
-       70,  461,  458,    0,  455,  469,   73,  451,  449,   82,
-       93,   71,   85,   79,   95,   84,   87,   96,   97,   98,
-      101,  100,  116,  107,  102,  117,  115,  125,  108,  127,
-      126,  128,  132,  130,  131,  141,  142,  143,  144,  157,
-      144,  448,  160,  162,  151,  149,  164,  165,  167,  168,
-      448,  169,  170,  171,  172,  173,  174,  181,  176,  183,
-      185,  184,  188,  187,  193,  195,  194,  196,  197,  208,
-
-      206,  190,  447,  213,  446,  214,  216,  217,  218,  444,
-      220,  219,  444,  443,  222,  223,  224,  221,  442,  441,
-      440,  240,  243,  229,  439,  226,  227,  245,  438,  246,
-      247,  249,  437,  254,  250,  252,  256,  258,  259,  262,
-      263,  265,  269,  268,  271,  272,  273,  436,  435,  434,
-      275,  282,  274,  281,  433,  277,  290,  292,  293,  295,
-      296,  432,  431,  430,  297,  298,  302,  303,  306,  307,
-      308,  309,  312,  429,  310,  317,  311,  320,  322,  328,
-      329,  330,  428,  331,  427,  333,  426,  335,  339,  425,
-      337,  424,  423,  336,  338,  422,  421,  340,  347,  420,
-
-      419,  341,  352,  353,  354,  418,  417,  416,  409,  406,
-      362,  360,  367,  368,  370,  371,  375,  373,  376,  377,
-      378,  380,  400,  382,  388,  379,  386,  392,  385,  389,
-      343,  469,  412,  416,  420,  115
+        0,    0,  479,  480,  476,  480,    0,    0,  471,  466,
+       29,  480,  466,   31,   32,   33,   34,   35,   40,   47,
+       38,   42,   49,   52,   54,   56,   62,   65,   68,   69,
+       71,   70,  472,  469,    0,  466,  480,   85,  462,  460,
+       87,   98,   72,   73,   79,  100,   81,   92,   94,   91,
+      102,  103,  105,  110,  112,  116,  119,  120,  121,  122,
+      123,  127,  128,  133,  134,  146,  136,  140,  141,  147,
+      142,  160,  155,  459,  164,  166,  162,  160,  169,  170,
+      171,  172,  459,  173,  174,  175,  176,  178,  180,  182,
+      186,  184,  191,  188,  194,  195,  196,  197,  199,  201,
+
+      200,  210,  212,  207,  213,  458,  214,  457,  221,  222,
+      223,  224,  455,  226,  225,  455,  454,  228,  234,  231,
+      232,  453,  452,  451,  227,  247,  237,  450,  250,  253,
+      241,  449,  256,  258,  259,  448,  238,  262,  260,  264,
+      266,  268,  269,  270,  273,  267,  279,  274,  281,  280,
+      283,  447,  446,  445,  286,  287,  284,  291,  444,  292,
+      297,  300,  303,  304,  305,  308,  443,  442,  441,  309,
+      306,  311,  313,  315,  310,  318,  319,  320,  440,  321,
+      332,  339,  439,  329,  327,  340,  330,  342,  438,  343,
+      437,  344,  436,  345,  346,  435,  348,  434,  433,  351,
+
+      353,  432,  425,  354,  355,  422,  417,  356,  364,  359,
+      365,  416,  413,  412,  411,  410,  372,  374,  366,  373,
+      376,  377,  381,  382,  384,  387,  390,  392,  409,  391,
+      394,  397,  398,  405,  404,  408,  137,  480,  428,  432,
+      436,   87
     } ;
 
-static yyconst short int yy_def[237] =
+static yyconst flex_int16_t yy_def[243] =
     {   0,
-      232,    1,  232,  232,  232,  232,  233,  234,  235,  232,
-      236,  232,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  232,  233,  234,  235,  232,  232,  236,  232,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  232,
-      232,  232,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  232,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,    0,  232,  232,  232,  232
+      238,    1,  238,  238,  238,  238,  239,  240,  241,  238,
+      242,  238,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  238,  239,  240,  241,  238,  238,  242,  238,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  238,  238,  238,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  238,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,    0,  238,  238,
+      238,  238
     } ;
 
-static yyconst short int yy_nxt[507] =
+static yyconst flex_int16_t yy_nxt[518] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
        12,   13,   13,   14,   15,   16,   17,   13,   18,   19,
-       20,   13,   21,   22,   23,   13,   13,   24,   25,   26,
-       27,   13,   28,   29,   30,   31,   13,   39,   40,  232,
-      232,  232,  232,  232,   46,   41,  232,   50,  232,   47,
-      232,   43,   55,   56,   42,  232,   44,  232,   57,   48,
-      232,   58,  232,   51,   61,   59,  232,   45,   49,   52,
-      232,   53,   54,  232,  232,   60,   63,  232,  232,  232,
-       62,   39,   37,   75,   64,   67,   69,  232,   65,   70,
-       39,   40,  232,  232,   66,  232,   68,   76,   41,   72,
-
-       73,  232,   74,  232,  232,  232,  232,   78,  232,  232,
-      232,   81,   80,   84,   77,  232,  232,   85,   38,   79,
-       87,   86,   83,  232,  232,  232,   90,   82,   88,   89,
-       91,   92,   94,  232,  232,  232,  232,   97,  232,  232,
-      232,   93,   98,   96,   99,  103,  104,   95,  102,  232,
-      232,  232,  232,   71,  100,  108,  101,  232,  105,  232,
-       70,  106,  107,   72,   72,  111,  110,  109,  232,   74,
-      232,   74,  232,  232,  112,  232,  232,  232,  232,  232,
-      232,  232,  232,  115,  232,  117,  113,  124,  121,  232,
-      114,  232,  232,  232,  118,  232,  232,  116,  232,  123,
-
-      128,  232,  232,  232,  232,  232,  119,  120,  126,  130,
-      122,  131,  133,  134,  232,  137,  232,  129,  125,  127,
-      135,  232,  232,  132,  232,  232,  232,  232,  232,  232,
-      232,  232,  232,  148,  232,  232,  136,  232,  152,  153,
-      138,  142,  143,  146,  144,  145,  140,  141,  232,  147,
-      139,  232,  151,  232,  232,  232,  149,  232,  232,  150,
-      232,  157,  232,  154,  232,  158,  232,  232,  160,  155,
-      232,  232,  156,  232,  159,  163,  232,  232,  164,  232,
-      232,  232,  232,  232,  168,  232,  161,  162,  171,  232,
-      232,  166,  167,  165,  169,  172,  173,  175,  232,  174,
-
-      232,  232,  170,  232,  232,  232,  232,  176,  177,  179,
-      232,  232,  181,  182,  232,  232,  232,  232,  232,  232,
-      232,  178,  184,  180,  188,  232,  185,  193,  232,  192,
-      232,  183,  186,  189,  190,  191,  232,  232,  232,  232,
-      194,  232,  187,  232,  232,  232,  232,  232,  232,  232,
-      201,  232,  195,  196,  205,  232,  199,  197,  198,  202,
-      232,  232,  232,  207,  209,  206,  200,  203,  232,  210,
-      232,  208,  204,  212,  213,  232,  232,  214,  232,  232,
-      215,  232,  211,  232,  232,  232,  232,  232,  232,  216,
-      232,  218,  226,  232,  232,  219,  232,  232,  217,  222,
-
-      232,  220,  227,  221,  228,  224,  223,  231,  232,  229,
-      225,  230,   33,   33,  232,   33,   34,  232,   34,   34,
-       35,   35,   35,   35,  232,  232,  232,  232,  232,  232,
-      232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
-      232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
-      232,  232,  232,  110,  232,  232,  232,  110,   71,  232,
-       36,   36,   32,  232,   37,   36,   32,  232,    3,  232,
-      232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
-      232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
-      232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
-
-      232,  232,  232,  232,  232,  232
+       20,   13,   21,   22,   23,   13,   24,   25,   26,   27,
+       28,   13,   29,   30,   31,   32,   13,   40,   41,  238,
+      238,  238,  238,  238,   47,   42,  238,   51,  238,   48,
+      238,   44,   56,   57,   43,  238,   45,  238,   58,   49,
+      238,   59,  238,   52,  238,   60,   63,   46,   50,   53,
+      238,   54,   55,  238,   65,   61,  238,  238,  238,  238,
+      238,  238,   64,   62,   77,   78,   71,  238,   69,  238,
+       39,   67,   66,   40,   38,   40,   41,   68,   70,  238,
+
+      238,   72,  238,   42,   74,   75,  238,   76,  238,   83,
+      238,  238,   80,  238,   79,   86,   81,   82,  238,   87,
+      238,   84,   90,   88,  238,   89,   85,  238,  238,  238,
+      238,  238,   93,   94,   91,  238,  238,   96,  100,   98,
+       92,  238,  238,   95,  238,  238,  102,  106,  238,  238,
+      238,   99,   97,  105,  238,  238,  103,  101,  104,  111,
+      109,  110,  107,  108,   73,  112,   74,   74,  238,  113,
+      238,   72,  238,   76,  238,   76,  114,  238,  238,  238,
+      238,  238,  238,  238,  238,  115,  238,  118,  238,  120,
+      238,  116,  238,  124,  238,  117,  238,  127,  121,  238,
+
+      126,  119,  238,  238,  238,  238,  131,  238,  238,  238,
+      122,  123,  133,  134,  129,  238,  125,  136,  238,  128,
+      238,  238,  238,  130,  139,  132,  138,  137,  135,  238,
+      238,  238,  238,  238,  238,  238,  238,  140,  141,  238,
+      238,  142,  238,  153,  152,  238,  238,  146,  147,  238,
+      148,  149,  144,  145,  150,  238,  151,  143,  238,  158,
+      155,  238,  156,  154,  238,  157,  238,  238,  238,  162,
+      238,  161,  238,  163,  238,  238,  238,  238,  238,  159,
+      165,  238,  238,  160,  164,  168,  169,  238,  238,  238,
+      173,  238,  238,  171,  238,  238,  166,  167,  176,  238,
+
+      238,  178,  172,  170,  174,  238,  177,  180,  238,  179,
+      175,  238,  238,  238,  238,  182,  238,  238,  238,  238,
+      185,  238,  181,  238,  187,  188,  238,  238,  238,  238,
+      183,  190,  184,  186,  194,  238,  191,  238,  238,  189,
+      238,  192,  196,  195,  198,  193,  197,  238,  238,  200,
+      238,  238,  238,  238,  238,  199,  238,  201,  203,  238,
+      207,  238,  238,  238,  238,  202,  208,  238,  205,  211,
+      204,  213,  238,  238,  238,  216,  215,  206,  209,  212,
+      238,  238,  238,  218,  238,  238,  214,  210,  219,  238,
+      238,  220,  238,  217,  221,  238,  224,  223,  238,  238,
+
+      238,  225,  238,  222,  232,  238,  238,  226,  228,  227,
+      234,  233,  238,  238,  229,  230,  238,  238,  238,  238,
+      238,  238,  231,  236,  238,  238,  237,  235,   34,   34,
+      238,   34,   35,  238,   35,   35,   36,   36,   36,   36,
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  113,  238,  238,  238,  113,   73,
+      238,   37,   37,   33,  238,   38,   37,   33,  238,    3,
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  238,  238,  238
     } ;
 
-static yyconst short int yy_chk[507] =
+static yyconst flex_int16_t yy_chk[518] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -485,61 +571,65 @@ static yyconst short int yy_chk[507] =
         1,    1,    1,    1,    1,    1,    1,   11,   11,   14,
        15,   16,   17,   18,   16,   11,   21,   18,   19,   16,
        22,   15,   21,   22,   14,   20,   15,   23,   22,   17,
-       24,   23,   26,   18,   24,   23,   25,   15,   17,   19,
-       27,   20,   20,   28,   29,   23,   25,   30,   31,   42,
-       24,   37,   37,   42,   26,   29,   31,   44,   27,   37,
-       40,   40,   46,   43,   28,   47,   30,   43,   40,   41,
-
-       41,   41,   41,   45,   48,   49,   50,   45,   52,   51,
-       55,   48,   47,   51,   44,   54,   59,   51,  236,   46,
-       52,   51,   50,   57,   53,   56,   55,   49,   53,   54,
-       56,   56,   57,   58,   61,   60,   62,   59,   64,   65,
-       63,   56,   60,   58,   61,   63,   64,   57,   62,   66,
-       67,   68,   69,   71,   61,   68,   61,   76,   65,   75,
-       71,   66,   67,   70,   70,   75,   70,   69,   73,   73,
-       74,   74,   77,   78,   76,   79,   80,   82,   83,   84,
-       85,   86,   87,   79,   89,   82,   77,   89,   86,   88,
-       78,   90,   92,   91,   83,   94,   93,   80,  102,   88,
-
-       93,   95,   97,   96,   98,   99,   84,   85,   91,   95,
-       87,   96,   98,   99,  101,  102,  100,   94,   90,   92,
-      100,  104,  106,   97,  107,  108,  109,  112,  111,  118,
-      115,  116,  117,  118,  126,  127,  101,  124,  126,  127,
-      104,  109,  111,  116,  112,  115,  107,  108,  122,  117,
-      106,  123,  124,  128,  130,  131,  122,  132,  135,  123,
-      136,  132,  134,  128,  137,  134,  138,  139,  136,  130,
-      140,  141,  131,  142,  135,  139,  144,  143,  140,  145,
-      146,  147,  153,  151,  144,  156,  137,  138,  147,  154,
-      152,  142,  143,  141,  145,  151,  152,  154,  157,  153,
-
-      158,  159,  146,  160,  161,  165,  166,  156,  157,  159,
-      167,  168,  161,  165,  169,  170,  171,  172,  175,  177,
-      173,  158,  167,  160,  171,  176,  168,  177,  178,  176,
-      179,  166,  169,  172,  173,  175,  180,  181,  182,  184,
-      178,  186,  170,  188,  194,  191,  195,  189,  198,  202,
-      188,  231,  179,  180,  195,  199,  184,  181,  182,  189,
-      203,  204,  205,  199,  203,  198,  186,  191,  212,  204,
-      211,  202,  194,  211,  212,  213,  214,  212,  215,  216,
-      212,  218,  205,  217,  219,  220,  221,  226,  222,  212,
-      224,  214,  222,  229,  227,  215,  225,  230,  213,  218,
-
-      228,  216,  224,  217,  225,  220,  219,  230,  223,  226,
-      221,  227,  233,  233,  210,  233,  234,  209,  234,  234,
-      235,  235,  235,  235,  208,  207,  206,  201,  200,  197,
-      196,  193,  192,  190,  187,  185,  183,  174,  164,  163,
-      162,  155,  150,  149,  148,  133,  129,  125,  121,  120,
-      119,  114,  113,  110,  105,  103,   81,   72,   39,   38,
-       35,   33,   32,   13,   10,    9,    5,    3,  232,  232,
-      232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
-      232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
-      232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
-
-      232,  232,  232,  232,  232,  232
+       24,   23,   25,   18,   26,   23,   25,   15,   17,   19,
+       27,   20,   20,   28,   26,   23,   29,   30,   32,   31,
+       43,   44,   25,   24,   43,   44,   32,   45,   30,   47,
+      242,   28,   27,   38,   38,   41,   41,   29,   31,   50,
+
+       48,   38,   49,   41,   42,   42,   42,   42,   46,   49,
+       51,   52,   46,   53,   45,   52,   47,   48,   54,   52,
+       55,   50,   54,   52,   56,   53,   51,   57,   58,   59,
+       60,   61,   57,   57,   55,   62,   63,   58,   61,   59,
+       56,   64,   65,   57,   67,  237,   63,   65,   68,   69,
+       71,   60,   58,   64,   66,   70,   63,   62,   63,   70,
+       68,   69,   66,   67,   73,   71,   72,   72,   78,   72,
+       77,   73,   75,   75,   76,   76,   77,   79,   80,   81,
+       82,   84,   85,   86,   87,   78,   88,   81,   89,   84,
+       90,   79,   92,   88,   91,   80,   94,   91,   85,   93,
+
+       90,   82,   95,   96,   97,   98,   95,   99,  101,  100,
+       86,   87,   97,   98,   93,  104,   89,  100,  102,   92,
+      103,  105,  107,   94,  103,   96,  102,  101,   99,  109,
+      110,  111,  112,  115,  114,  125,  118,  104,  105,  120,
+      121,  107,  119,  125,  121,  127,  137,  112,  114,  131,
+      115,  118,  110,  111,  119,  126,  120,  109,  129,  131,
+      127,  130,  129,  126,  133,  130,  134,  135,  139,  137,
+      138,  135,  140,  138,  141,  146,  142,  143,  144,  133,
+      140,  145,  148,  134,  139,  143,  144,  147,  150,  149,
+      148,  151,  157,  146,  155,  156,  141,  142,  151,  158,
+
+      160,  156,  147,  145,  149,  161,  155,  158,  162,  157,
+      150,  163,  164,  165,  171,  161,  166,  170,  175,  172,
+      164,  173,  160,  174,  166,  170,  176,  177,  178,  180,
+      162,  172,  163,  165,  176,  185,  173,  184,  187,  171,
+      181,  174,  178,  177,  181,  175,  180,  182,  186,  184,
+      188,  190,  192,  194,  195,  182,  197,  185,  187,  200,
+      194,  201,  204,  205,  208,  186,  195,  210,  190,  201,
+      188,  205,  209,  211,  219,  210,  209,  192,  197,  204,
+      217,  220,  218,  217,  221,  222,  208,  200,  218,  223,
+      224,  218,  225,  211,  218,  226,  220,  219,  227,  230,
+
+      228,  221,  231,  218,  228,  232,  233,  222,  224,  223,
+      231,  230,  235,  234,  225,  226,  236,  229,  216,  215,
+      214,  213,  227,  233,  212,  207,  236,  232,  239,  239,
+      206,  239,  240,  203,  240,  240,  241,  241,  241,  241,
+      202,  199,  198,  196,  193,  191,  189,  183,  179,  169,
+      168,  167,  159,  154,  153,  152,  136,  132,  128,  124,
+      123,  122,  117,  116,  113,  108,  106,   83,   74,   40,
+       39,   36,   34,   33,   13,   10,    9,    5,    3,  238,
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  238,  238,  238
     } ;
 
 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.
  */
@@ -549,9 +639,8 @@ static char *yy_last_accepting_cpos;
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "testpatternl.l"
-#define INITIAL 0
 /*
- * "$Id: testpatternl.l,v 1.17 2005/07/28 00:58:45 rlk Exp $"
+ * "$Id: testpatternl.l,v 1.17.14.1 2007/12/15 20:35:52 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -611,7 +700,23 @@ do							\
  while (0)
 
 
-#line 615 "testpatternl.c"
+#line 704 "testpatternl.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.
@@ -619,65 +724,30 @@ do							\
 
 #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 ));
+extern int yywrap (void );
 #endif
 #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 ));
+static int yyinput (void );
 #else
-static int input YY_PROTO(( void ));
-#endif
+static int input (void );
 #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
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#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. */
@@ -686,7 +756,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().
@@ -699,9 +768,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; \
@@ -711,9 +781,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();" -
@@ -734,12 +817,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.
@@ -756,27 +845,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 "testpatternl.l"
 
 
-#line 769 "testpatternl.c"
+#line 860 "testpatternl.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;
@@ -784,68 +875,68 @@ 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 )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 233 )
+				if ( yy_current_state >= 239 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 469 );
+		while ( yy_base[yy_current_state] != 480 );
 
 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:
@@ -1051,75 +1142,82 @@ yylval.ival = WHITE;DBG(WHITE); return WHITE;
 case 41:
 YY_RULE_SETUP
 #line 115 "testpatternl.l"
-DBG(MESSAGE); return MESSAGE;
+DBG(OUTPUT); return OUTPUT;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 116 "testpatternl.l"
-DBG(END); return END;
+DBG(MESSAGE); return MESSAGE;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 119 "testpatternl.l"
-yylval.ival = atoi(yytext); DBG(tINT); return tINT;
+#line 117 "testpatternl.l"
+DBG(END); return END;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 120 "testpatternl.l"
-yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
+yylval.ival = atoi(yytext); DBG(tINT); return tINT;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 121 "testpatternl.l"
-yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING;
+yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
 case 46:
+/* rule 46 can match eol */
 YY_RULE_SETUP
 #line 122 "testpatternl.l"
-DBG(whitespace); 	/* Skip blanks/tabs */
+yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING;
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 123 "testpatternl.l"
-DBG(comment); 	/* Skip comments */
+DBG(whitespace); 	/* Skip blanks/tabs */
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 124 "testpatternl.l"
-DBG(newline); mylineno++;
+DBG(comment); 	/* Skip comments */
 	YY_BREAK
 case 49:
+/* rule 49 can match eol */
 YY_RULE_SETUP
 #line 125 "testpatternl.l"
+DBG(newline); mylineno++;
+	YY_BREAK
+case 50:
+YY_RULE_SETUP
+#line 126 "testpatternl.l"
 ECHO;
 	YY_BREAK
-#line 1097 "testpatternl.c"
+#line 1195 "testpatternl.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
@@ -1129,13 +1227,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
@@ -1148,30 +1246,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
@@ -1182,7 +1280,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;
@@ -1190,30 +1288,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;
@@ -1224,8 +1322,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
  *
@@ -1234,21 +1331,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.
@@ -1268,34 +1364,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 )
 				{
@@ -1308,8 +1400,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. */
@@ -1319,35 +1410,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;
 			}
 		}
@@ -1355,152 +1446,137 @@ 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 )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 233 )
+			if ( yy_current_state >= 239 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 		}
 
 	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 )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 233 )
+		if ( yy_current_state >= 239 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 232);
+	yy_is_jam = (yy_current_state == 238);
 
 	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()
@@ -1514,16 +1590,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();
@@ -1533,90 +1609,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()" );
 
@@ -1625,80 +1703,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 );
+		yyfree((void *) b->yy_ch_buf  );
 
-	yy_flex_free( (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
+	yyfree((void *) b  );
+}
 
+#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
-	}
-
+    /* 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;
+    }
 
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
+        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;
@@ -1715,29 +1788,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()" );
 
@@ -1751,56 +1916,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()" );
 
@@ -1810,148 +1970,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 );
+}
 
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
+/* Redefine yyless() so it works in section 3 code. */
 
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, 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 )
 
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
+/* Accessor  methods (get/set functions) to struct members. */
 
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
 
-	BEGIN(new_state);
-	}
-#endif
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
 
+/** Get the length of the current token.
+ * 
+ */
+int yyget_leng  (void)
+{
+        return yyleng;
+}
 
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
+/** Get the current token.
+ * 
+ */
 
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
+char *yyget_text  (void)
+{
+        return yytext;
+}
 
+/** 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 ;
+}
 
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
+void yyset_out (FILE *  out_str )
+{
+        yyout = out_str ;
+}
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
+
+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
@@ -1960,23 +2149,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 */
+}
 
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
-#line 125 "testpatternl.l"
+#define YYTABLES_NAME "yytables"
+
+#line 126 "testpatternl.l"
diff --git a/src/testpattern/testpatternl.l b/src/testpattern/testpatternl.l
index 3d430fb..e7a213d 100644
--- a/src/testpattern/testpatternl.l
+++ b/src/testpattern/testpatternl.l
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpatternl.l,v 1.17 2005/07/28 00:58:45 rlk Exp $"
+ * "$Id: testpatternl.l,v 1.17.14.1 2007/12/15 20:35:52 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -112,6 +112,7 @@ cmy			yylval.ival = RGB;DBG(CMY); return CMY;
 grey			yylval.ival = GRAY;DBG(GRAY); return GRAY;
 gray			yylval.ival = GRAY;DBG(GRAY); return GRAY;
 white			yylval.ival = WHITE;DBG(WHITE); return WHITE;
+output			DBG(OUTPUT); return OUTPUT;
 message			DBG(MESSAGE); return MESSAGE;
 end			DBG(END); return END;
 
diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c
index 25a082c..524355e 100644
--- a/src/testpattern/testpatterny.c
+++ b/src/testpattern/testpatterny.c
@@ -109,7 +109,8 @@
      MODE = 298,
      PAGESIZE = 299,
      MESSAGE = 300,
-     END = 301
+     OUTPUT = 301,
+     END = 302
    };
 #endif
 /* Tokens.  */
@@ -156,7 +157,8 @@
 #define MODE 298
 #define PAGESIZE 299
 #define MESSAGE 300
-#define END 301
+#define OUTPUT 301
+#define END 302
 
 
 
@@ -260,7 +262,7 @@ typedef int YYSTYPE;
 
 
 /* Line 216 of yacc.c.  */
-#line 264 "testpatterny.c"
+#line 266 "testpatterny.c"
 
 #ifdef short
 # undef short
@@ -473,22 +475,22 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  54
+#define YYFINAL  59
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   134
+#define YYLAST   136
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  47
+#define YYNTOKENS  48
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  66
+#define YYNNTS  70
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  117
+#define YYNRULES  123
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  174
+#define YYNSTATES  180
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   301
+#define YYMAXUTOK   302
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -526,7 +528,7 @@ static const yytype_uint8 yytranslate[] =
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46
+      45,    46,    47
 };
 
 #if YYDEBUG
@@ -542,64 +544,67 @@ static const yytype_uint16 yyprhs[] =
      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
+     232,   234,   236,   238,   240,   243,   245,   247,   249,   251,
+     253,   255,   257,   259,   261,   263,   265,   267,   269,   271,
+     273,   275,   277,   279,   281,   283,   285,   287,   290,   292,
+     294,   296,   298,   301,   302,   305,   307,   308,   311,   313,
+     315,   316,   319,   320
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-     111,     0,    -1,     6,    -1,     7,    -1,     8,    -1,     9,
+     116,     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,
-      -1,    49,    -1,    50,    -1,    51,    -1,    52,    -1,    53,
-      -1,    54,    -1,    55,    -1,    43,    56,    -1,    15,    48,
-       4,    -1,    15,     3,     4,    -1,    14,    48,     4,    -1,
+      -1,    50,    -1,    51,    -1,    52,    -1,    53,    -1,    54,
+      -1,    55,    -1,    56,    -1,    43,    57,    -1,    15,    49,
+       4,    -1,    15,     3,     4,    -1,    14,    49,     4,    -1,
       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,
+       3,     3,    -1,    67,    -1,    68,    -1,    19,     5,     5,
       -1,    20,     5,     3,    -1,    21,     5,     4,    -1,    22,
-       5,     5,    -1,    69,    -1,    70,    -1,    71,    -1,    72,
+       5,     5,    -1,    70,    -1,    71,    -1,    72,    -1,    73,
       -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,
+       4,     4,    -1,    81,    -1,    82,    81,    -1,    -1,    82,
+      -1,    81,    83,    -1,    49,     4,     4,     4,    -1,    35,
+       3,     4,     4,     4,    -1,    85,    -1,    86,    -1,    87,
+      -1,    88,    87,    -1,    -1,    88,    -1,    84,    -1,    89,
+      -1,     4,     4,     4,     4,     4,    -1,    29,    91,    90,
+      -1,    30,    90,    -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
+       5,     5,     5,     5,     5,    -1,    96,    -1,    97,    -1,
+      98,    -1,    99,    -1,   100,    -1,   101,    -1,    46,    -1,
+      46,     5,    -1,   103,    -1,   104,    -1,   105,    -1,    61,
+      -1,    62,    -1,    59,    -1,    60,    -1,    63,    -1,    64,
+      -1,    65,    -1,    66,    -1,    74,    -1,    75,    -1,    76,
+      -1,    77,    -1,    78,    -1,    79,    -1,    80,    -1,    58,
+      -1,    69,    -1,   102,    -1,   106,    -1,   107,    34,    -1,
+      92,    -1,    93,    -1,    94,    -1,   102,    -1,   109,    34,
+      -1,    -1,   111,   110,    -1,    95,    -1,    -1,   113,   108,
+      -1,   111,    -1,   112,    -1,    -1,    47,    34,    -1,    -1,
+     113,   117,   114,   115,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 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,
-     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
+       0,   140,   140,   140,   140,   140,   141,   141,   141,   141,
+     144,   156,   168,   180,   192,   204,   216,   228,   228,   228,
+     228,   228,   228,   228,   231,   234,   244,   253,   263,   272,
+     279,   286,   293,   302,   311,   320,   320,   323,   333,   342,
+     351,   365,   365,   365,   365,   367,   374,   381,   388,   395,
+     402,   410,   425,   425,   428,   428,   431,   434,   448,   461,
+     461,   464,   464,   467,   467,   470,   470,   473,   488,   491,
+     506,   517,   534,   540,   547,   555,   564,   575,   575,   575,
+     575,   575,   578,   581,   588,   593,   593,   596,   599,   599,
+     599,   599,   599,   599,   600,   600,   600,   600,   600,   600,
+     600,   601,   601,   601,   601,   601,   601,   604,   608,   608,
+     608,   608,   611,   615,   615,   618,   622,   622,   625,   625,
+     628,   628,   633,   632
 };
 #endif
 
@@ -615,19 +620,20 @@ static const char *const yytname[] =
   "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
+  "MESSAGE", "OUTPUT", "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", "Output0", "Output1", "A_Output", "output", "A_Rule", "Rule",
+  "A_Pattern", "Pattern", "Patterns", "Image", "Rules", "Output", "EOF",
+  "Thing", "@1", 0
 };
 #endif
 
@@ -640,25 +646,26 @@ static const yytype_uint16 yytoknum[] =
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301
+     295,   296,   297,   298,   299,   300,   301,   302
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 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,    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
+       0,    48,    49,    49,    49,    49,    49,    49,    49,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    57,    57,
+      57,    57,    57,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    69,    70,    71,    72,
+      73,    74,    74,    74,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    82,    83,    83,    84,    85,    86,    87,
+      87,    88,    88,    89,    89,    90,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   101,   101,
+     101,   101,   102,   103,   104,   105,   105,   106,   107,   107,
+     107,   107,   107,   107,   107,   107,   107,   107,   107,   107,
+     107,   107,   107,   107,   107,   107,   107,   108,   109,   109,
+     109,   109,   110,   111,   111,   112,   113,   113,   114,   114,
+     115,   115,   117,   116
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -672,10 +679,11 @@ static const yytype_uint8 yyr2[] =
        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,     2,     1,     1,     1,     1,     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,     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
@@ -683,73 +691,73 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-     110,   116,     0,     0,     0,     0,     0,     0,     0,     0,
+     116,   122,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       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
+       0,    83,   103,    90,    91,    88,    89,    92,    93,    94,
+      95,    35,    36,   104,    41,    42,    43,    44,    96,    97,
+      98,    99,   100,   101,   102,    77,    78,    79,    80,    81,
+      82,   105,    85,    86,    87,   106,     0,   117,   113,     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,    84,   107,     0,   115,   118,   119,
+     120,    28,    27,    26,    25,    37,    38,    39,    40,     0,
+      10,    11,    12,    13,    14,    15,    34,    73,     0,     0,
+      63,     0,   108,   109,   110,   111,     0,   114,     0,   123,
+      16,    74,    71,     0,    63,     0,     0,     0,    54,    65,
+      59,    60,    61,    64,    66,    69,    70,   112,   121,    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 yytype_int16 yydefgoto[] =
 {
-      -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
+      -1,   147,    93,    94,    95,    96,    97,    98,    99,   100,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,   148,   166,   167,   149,   150,   151,   152,
+     153,   154,   155,   144,   132,   133,   134,   107,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,   136,   137,   108,   109,     1,   110,   139,     2,    58
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -118
+#define YYPACT_NINF -124
 static const yytype_int16 yypact[] =
 {
-    -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
+    -124,   -14,    16,    57,    41,    24,    54,    67,    68,    69,
+      70,    77,    55,    79,    80,    81,    82,    84,    40,    23,
+      83,    85,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,
+    -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,
+    -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,
+    -124,  -124,  -124,  -124,  -124,  -124,    58,  -124,    59,  -124,
+      89,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,
+      90,    91,    92,  -124,  -124,  -124,    93,    86,    95,    96,
+    -124,  -124,  -124,  -124,  -124,  -124,    94,    97,    99,   100,
+     101,   102,   103,  -124,  -124,  -124,  -124,  -124,  -124,  -124,
+    -124,   104,  -124,   105,  -124,  -124,   106,  -124,    12,  -124,
+      61,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,   108,
+    -124,  -124,  -124,  -124,  -124,  -124,  -124,   107,   110,   111,
+      11,   113,  -124,  -124,  -124,  -124,    87,  -124,    88,  -124,
+    -124,   109,  -124,   114,    11,   115,   117,   119,   120,  -124,
+    -124,  -124,  -124,    27,  -124,  -124,  -124,  -124,  -124,   112,
+     121,  -124,   122,   123,   124,  -124,   120,  -124,  -124,  -124,
+     125,  -124,   126,   127,  -124,   128,   129,  -124,  -124,  -124
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-    -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
+    -124,    52,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,
+    -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,
+    -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,
+    -124,  -124,  -124,  -123,  -124,  -124,  -124,  -124,  -124,   -19,
+    -124,  -124,    -9,  -124,  -124,  -124,  -124,  -124,  -124,  -124,
+    -124,  -124,  -124,  -124,    28,  -124,  -124,  -124,  -124,  -124,
+    -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124,  -124
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -760,61 +768,61 @@ static const yytype_int8 yypgoto[] =
 static const yytype_uint8 yytable[] =
 {
        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
+      13,    14,    15,    16,    17,   145,    59,    62,    63,    64,
+      65,    66,    67,    68,    69,   165,   101,    73,   102,    18,
+      19,    20,    21,    62,    63,    64,    65,    66,    67,    68,
+      69,   129,   130,   174,    71,   131,   146,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    72,    20,    74,    80,
+      60,    61,   146,    62,    63,    64,    65,    66,    67,    68,
+      69,    86,    75,    76,    77,    78,    87,    88,    89,    90,
+      91,    92,    79,    81,    82,    83,    84,    85,   103,   116,
+     104,   106,   105,   111,   112,   113,   114,   119,   115,   117,
+     120,   118,   121,   122,   123,   124,   125,   126,   138,   128,
+     127,   140,   141,   142,   159,   143,   156,   169,   160,   162,
+     163,   157,   158,   164,   145,   170,   171,   172,   173,   175,
+     176,   177,   178,   179,   168,   161,   135
 };
 
 static const yytype_uint8 yycheck[] =
 {
       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,   142,     3,     3,     5,    43,
-      44,    45,     6,     7,     8,     9,    10,    11,    12,    13,
-       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,     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
+       9,    10,    11,    12,    13,   148,     3,     3,     5,    43,
+      44,    45,    46,     6,     7,     8,     9,    10,    11,    12,
+      13,    29,    30,   166,     3,    33,    35,     6,     7,     8,
+       9,    10,    11,    12,    13,     3,     4,    45,     4,     4,
+       3,     4,    35,     6,     7,     8,     9,    10,    11,    12,
+      13,    31,     5,     5,     5,     5,    36,    37,    38,    39,
+      40,    41,     5,     4,     4,     4,     4,     3,     5,     3,
+       5,    32,    34,     4,     4,     4,     4,     3,     5,     4,
+       3,     5,     3,     3,     3,     3,     3,     3,    47,     3,
+       5,     3,     5,     3,     5,     4,     3,     5,     4,     4,
+       3,    34,    34,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,   153,   144,   108
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,   108,   111,    14,    15,    16,    17,    18,    19,    20,
+       0,   113,   116,    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,
+      45,    46,    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
+      76,    77,    78,    79,    80,    96,    97,    98,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,   117,     0,
+       3,     4,     6,     7,     8,     9,    10,    11,    12,    13,
+      49,     3,    49,     3,     4,     5,     5,     5,     5,     5,
+       4,     4,     4,     4,     4,     3,    31,    36,    37,    38,
+      39,    40,    41,    50,    51,    52,    53,    54,    55,    56,
+      57,     3,     5,     5,     5,    34,    32,    95,   111,   112,
+     114,     4,     4,     4,     4,     5,     3,     4,     5,     3,
+       3,     3,     3,     3,     3,     3,     3,     5,     3,    29,
+      30,    33,    92,    93,    94,   102,   109,   110,    47,   115,
+       3,     5,     3,     4,    91,     4,    35,    49,    81,    84,
+      85,    86,    87,    88,    89,    90,     3,    34,    34,     5,
+       4,    90,     4,     3,     4,    81,    82,    83,    87,     5,
+       4,     4,     4,     4,    81,     4,     4,     4,     4,     4
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1629,7 +1637,7 @@ yyreduce:
   switch (yyn)
     {
         case 10:
-#line 144 "testpatterny.y"
+#line 145 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>cmykspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1642,7 +1650,7 @@ yyreduce:
     break;
 
   case 11:
-#line 156 "testpatterny.y"
+#line 157 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>kcmyspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1655,7 +1663,7 @@ yyreduce:
     break;
 
   case 12:
-#line 168 "testpatterny.y"
+#line 169 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>rgbspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1668,7 +1676,7 @@ yyreduce:
     break;
 
   case 13:
-#line 180 "testpatterny.y"
+#line 181 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>cmyspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1681,7 +1689,7 @@ yyreduce:
     break;
 
   case 14:
-#line 192 "testpatterny.y"
+#line 193 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>grayspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1694,7 +1702,7 @@ yyreduce:
     break;
 
   case 15:
-#line 204 "testpatterny.y"
+#line 205 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>whitespec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1707,7 +1715,7 @@ yyreduce:
     break;
 
   case 16:
-#line 216 "testpatterny.y"
+#line 217 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>extendedspec %d\n", (yyvsp[(2) - (3)].ival));
@@ -1720,7 +1728,7 @@ yyreduce:
     break;
 
   case 25:
-#line 234 "testpatterny.y"
+#line 235 "testpatterny.y"
     {
 	  int channel = find_color((yyvsp[(2) - (3)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1731,7 +1739,7 @@ yyreduce:
     break;
 
   case 26:
-#line 244 "testpatterny.y"
+#line 245 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>channel_level %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval));
@@ -1741,7 +1749,7 @@ yyreduce:
     break;
 
   case 27:
-#line 253 "testpatterny.y"
+#line 254 "testpatterny.y"
     {
 	  int channel = find_color((yyvsp[(2) - (3)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1752,7 +1760,7 @@ yyreduce:
     break;
 
   case 28:
-#line 263 "testpatterny.y"
+#line 264 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>channel_gamma %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval));
@@ -1762,7 +1770,7 @@ yyreduce:
     break;
 
   case 29:
-#line 272 "testpatterny.y"
+#line 273 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>global_gamma %f\n", (yyvsp[(2) - (2)].dval));
@@ -1771,7 +1779,7 @@ yyreduce:
     break;
 
   case 30:
-#line 279 "testpatterny.y"
+#line 280 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>steps %d\n", (yyvsp[(2) - (2)].ival));
@@ -1780,7 +1788,7 @@ yyreduce:
     break;
 
   case 31:
-#line 286 "testpatterny.y"
+#line 287 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>ink_limit %f\n", (yyvsp[(2) - (2)].dval));
@@ -1789,7 +1797,7 @@ yyreduce:
     break;
 
   case 32:
-#line 293 "testpatterny.y"
+#line 294 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>printer %s\n", (yyvsp[(2) - (2)].sval));
@@ -1799,7 +1807,7 @@ yyreduce:
     break;
 
   case 33:
-#line 302 "testpatterny.y"
+#line 303 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>page_size_name %s\n", (yyvsp[(2) - (2)].sval));
@@ -1809,7 +1817,7 @@ yyreduce:
     break;
 
   case 34:
-#line 311 "testpatterny.y"
+#line 312 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>page_size_custom %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival));
@@ -1819,7 +1827,7 @@ yyreduce:
     break;
 
   case 37:
-#line 323 "testpatterny.y"
+#line 324 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>parameter_string %s %s\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
@@ -1830,7 +1838,7 @@ yyreduce:
     break;
 
   case 38:
-#line 333 "testpatterny.y"
+#line 334 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>parameter_int %s %d\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival));
@@ -1840,7 +1848,7 @@ yyreduce:
     break;
 
   case 39:
-#line 342 "testpatterny.y"
+#line 343 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>parameter_float %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval));
@@ -1850,7 +1858,7 @@ yyreduce:
     break;
 
   case 40:
-#line 351 "testpatterny.y"
+#line 352 "testpatterny.y"
     {
 	  stp_curve_t *curve = stp_curve_create_from_string((yyvsp[(3) - (3)].sval));
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1865,7 +1873,7 @@ yyreduce:
     break;
 
   case 45:
-#line 367 "testpatterny.y"
+#line 368 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>density %f\n", (yyvsp[(2) - (2)].dval));
@@ -1874,7 +1882,7 @@ yyreduce:
     break;
 
   case 46:
-#line 374 "testpatterny.y"
+#line 375 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>top %f\n", (yyvsp[(2) - (2)].dval));
@@ -1883,7 +1891,7 @@ yyreduce:
     break;
 
   case 47:
-#line 381 "testpatterny.y"
+#line 382 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>left %f\n", (yyvsp[(2) - (2)].dval));
@@ -1892,7 +1900,7 @@ yyreduce:
     break;
 
   case 48:
-#line 388 "testpatterny.y"
+#line 389 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>hsize %f\n", (yyvsp[(2) - (2)].dval));
@@ -1901,7 +1909,7 @@ yyreduce:
     break;
 
   case 49:
-#line 395 "testpatterny.y"
+#line 396 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>vsize %f\n", (yyvsp[(2) - (2)].dval));
@@ -1910,7 +1918,7 @@ yyreduce:
     break;
 
   case 50:
-#line 402 "testpatterny.y"
+#line 403 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>blackline %d\n", (yyvsp[(2) - (2)].ival));
@@ -1919,7 +1927,7 @@ yyreduce:
     break;
 
   case 51:
-#line 410 "testpatterny.y"
+#line 411 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", (yyvsp[(1) - (3)].dval), (yyvsp[(2) - (3)].dval), (yyvsp[(3) - (3)].dval),
@@ -1935,7 +1943,7 @@ yyreduce:
     break;
 
   case 57:
-#line 434 "testpatterny.y"
+#line 435 "testpatterny.y"
     {
 	  int channel = find_color((yyvsp[(1) - (4)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1950,7 +1958,7 @@ yyreduce:
     break;
 
   case 58:
-#line 448 "testpatterny.y"
+#line 449 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    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));
@@ -1964,7 +1972,7 @@ yyreduce:
     break;
 
   case 67:
-#line 473 "testpatterny.y"
+#line 474 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    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));
@@ -1980,7 +1988,7 @@ yyreduce:
     break;
 
   case 69:
-#line 491 "testpatterny.y"
+#line 492 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>xpattern\n");
@@ -1996,7 +2004,7 @@ yyreduce:
     break;
 
   case 70:
-#line 506 "testpatterny.y"
+#line 507 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>grid %d\n", (yyvsp[(2) - (2)].ival));
@@ -2008,7 +2016,7 @@ yyreduce:
     break;
 
   case 71:
-#line 517 "testpatterny.y"
+#line 518 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>image %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival));
@@ -2026,7 +2034,7 @@ yyreduce:
     break;
 
   case 72:
-#line 534 "testpatterny.y"
+#line 535 "testpatterny.y"
     {
 	  fprintf(stderr,"%s",(yyvsp[(2) - (2)].sval));
 	  free((yyvsp[(2) - (2)].sval));
@@ -2034,7 +2042,7 @@ yyreduce:
     break;
 
   case 73:
-#line 540 "testpatterny.y"
+#line 541 "testpatterny.y"
     {
 	  fprintf(stderr,"%s%s", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
 	  free((yyvsp[(2) - (3)].sval));
@@ -2043,7 +2051,7 @@ yyreduce:
     break;
 
   case 74:
-#line 547 "testpatterny.y"
+#line 548 "testpatterny.y"
     {
 	  fprintf(stderr,"%s%s%s", (yyvsp[(2) - (4)].sval), (yyvsp[(3) - (4)].sval), (yyvsp[(4) - (4)].sval));
 	  free((yyvsp[(2) - (4)].sval));
@@ -2053,7 +2061,7 @@ yyreduce:
     break;
 
   case 75:
-#line 555 "testpatterny.y"
+#line 556 "testpatterny.y"
     {
 	  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));
@@ -2064,7 +2072,7 @@ yyreduce:
     break;
 
   case 76:
-#line 564 "testpatterny.y"
+#line 565 "testpatterny.y"
     {
 	  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));
@@ -2075,28 +2083,44 @@ yyreduce:
 	}
     break;
 
-  case 101:
-#line 586 "testpatterny.y"
-    { global_did_something = 1; }
+  case 83:
+#line 582 "testpatterny.y"
+    {
+	  if (global_output)
+	    free(global_output);
+	  global_output = NULL;
+	}
     break;
 
-  case 106:
-#line 593 "testpatterny.y"
+  case 84:
+#line 589 "testpatterny.y"
+    {
+	  global_output = (yyvsp[(2) - (2)].sval);
+	}
+    break;
+
+  case 107:
+#line 605 "testpatterny.y"
     { global_did_something = 1; }
     break;
 
-  case 109:
-#line 600 "testpatterny.y"
+  case 112:
+#line 612 "testpatterny.y"
     { global_did_something = 1; }
     break;
 
   case 115:
-#line 610 "testpatterny.y"
+#line 619 "testpatterny.y"
+    { global_did_something = 1; }
+    break;
+
+  case 121:
+#line 629 "testpatterny.y"
     { return 0; }
     break;
 
-  case 116:
-#line 614 "testpatterny.y"
+  case 122:
+#line 633 "testpatterny.y"
     {
 	  current_testpattern = get_next_testpattern();
 	}
@@ -2104,7 +2128,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 2108 "testpatterny.c"
+#line 2132 "testpatterny.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2318,6 +2342,6 @@ yyreturn:
 }
 
 
-#line 620 "testpatterny.y"
+#line 639 "testpatterny.y"
 
 
diff --git a/src/testpattern/testpatterny.h b/src/testpattern/testpatterny.h
index 69e3127..a005618 100644
--- a/src/testpattern/testpatterny.h
+++ b/src/testpattern/testpatterny.h
@@ -82,7 +82,8 @@
      MODE = 298,
      PAGESIZE = 299,
      MESSAGE = 300,
-     END = 301
+     OUTPUT = 301,
+     END = 302
    };
 #endif
 /* Tokens.  */
@@ -129,7 +130,8 @@
 #define MODE 298
 #define PAGESIZE 299
 #define MESSAGE 300
-#define END 301
+#define OUTPUT 301
+#define END 302
 
 
 
diff --git a/src/testpattern/testpatterny.y b/src/testpattern/testpatterny.y
index bb2073f..c32b20f 100644
--- a/src/testpattern/testpatterny.y
+++ b/src/testpattern/testpatterny.y
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpatterny.y,v 1.26.18.2 2007/05/29 01:47:30 rlk Exp $"
+ * "$Id: testpatterny.y,v 1.26.18.3 2007/12/15 20:35:52 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -130,6 +130,7 @@ find_color(const char *name)
 %token MODE
 %token PAGESIZE
 %token MESSAGE
+%token OUTPUT
 %token END
 
 %start Thing
@@ -577,9 +578,27 @@ A_Message: Message0 | Message1 | Message2 | Message3 | Message4
 message: A_Message
 ;
 
+Output0: OUTPUT
+	{
+	  if (global_output)
+	    free(global_output);
+	  global_output = NULL;
+	}
+
+Output1: OUTPUT tSTRING
+	{
+	  global_output = $2;
+	}
+
+A_Output: Output0 | Output1
+;
+
+output: A_Output
+;
+
 A_Rule: gamma | channel_gamma | level | channel_level | global_gamma | steps
 	| ink_limit | printer | parameter | density | top | left | hsize
-	| vsize | blackline | inputspec | page_size | message
+	| vsize | blackline | inputspec | page_size | message | output
 ;
 
 Rule: A_Rule SEMI
diff --git a/test/Makefile.in b/test/Makefile.in
index 899bdac..98f5a8a 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -19,15 +19,11 @@
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/main
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -43,6 +39,7 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/scripts/global.mk
+TESTS = curve$(EXEEXT) run-testdither run-weavetest
 @BUILD_TEST_TRUE@noinst_PROGRAMS = testdither$(EXEEXT) \
 @BUILD_TEST_TRUE@	escp2-weavetest$(EXEEXT) unprint$(EXEEXT) \
 @BUILD_TEST_TRUE@	pcl-unprint$(EXEEXT) bjc-unprint$(EXEEXT) \
@@ -66,40 +63,40 @@ CONFIG_CLEAN_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am_bjc_unprint_OBJECTS = bjc-unprint.$(OBJEXT)
 bjc_unprint_OBJECTS = $(am_bjc_unprint_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/src/main/libgutenprint.la
-bjc_unprint_DEPENDENCIES = $(am__DEPENDENCIES_1)
+bjc_unprint_DEPENDENCIES = $(GUTENPRINT_LIBS)
 am_curve_OBJECTS = curve.$(OBJEXT)
 curve_OBJECTS = $(am_curve_OBJECTS)
-curve_DEPENDENCIES = $(am__DEPENDENCIES_1)
+curve_DEPENDENCIES = $(GUTENPRINT_LIBS)
 am_escp2_weavetest_OBJECTS = escp2-weavetest.$(OBJEXT)
 escp2_weavetest_OBJECTS = $(am_escp2_weavetest_OBJECTS)
-escp2_weavetest_DEPENDENCIES = $(am__DEPENDENCIES_1)
+escp2_weavetest_DEPENDENCIES = $(GUTENPRINT_LIBS)
 am_pcl_unprint_OBJECTS = pcl-unprint.$(OBJEXT)
 pcl_unprint_OBJECTS = $(am_pcl_unprint_OBJECTS)
-pcl_unprint_DEPENDENCIES = $(am__DEPENDENCIES_1)
+pcl_unprint_DEPENDENCIES = $(GUTENPRINT_LIBS)
 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)
+testdither_DEPENDENCIES = $(GUTENPRINT_LIBS)
 am_unprint_OBJECTS = unprint.$(OBJEXT)
 unprint_OBJECTS = $(am_unprint_OBJECTS)
-unprint_DEPENDENCIES = $(am__DEPENDENCIES_1)
+unprint_DEPENDENCIES = $(GUTENPRINT_LIBS)
 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)
+xml_curve_DEPENDENCIES = $(GUTENPRINT_LIBS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 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) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(bjc_unprint_SOURCES) $(curve_SOURCES) \
 	$(escp2_weavetest_SOURCES) $(pcl_unprint_SOURCES) \
 	$(pixma_parse_SOURCES) $(testdither_SOURCES) \
@@ -113,51 +110,13 @@ 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@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@
-BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-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@
-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@
@@ -167,8 +126,6 @@ CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -249,14 +206,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
 IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -276,9 +230,8 @@ LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
@@ -297,27 +250,26 @@ POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TEST = @TEST@
 TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
+TRUE = @TRUE@
 USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-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@
@@ -329,6 +281,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
@@ -374,11 +327,13 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 LOCAL_CPPFLAGS = -I$(top_srcdir)/src/main $(GUTENPRINT_CFLAGS)
-TESTS = curve run-testdither run-weavetest
 escp2_weavetest_SOURCES = escp2-weavetest.c
 escp2_weavetest_LDADD = $(GUTENPRINT_LIBS)
 unprint_SOURCES = unprint.c
@@ -441,28 +396,28 @@ clean-noinstPROGRAMS:
 	done
 bjc-unprint$(EXEEXT): $(bjc_unprint_OBJECTS) $(bjc_unprint_DEPENDENCIES) 
 	@rm -f bjc-unprint$(EXEEXT)
-	$(LINK) $(bjc_unprint_LDFLAGS) $(bjc_unprint_OBJECTS) $(bjc_unprint_LDADD) $(LIBS)
+	$(LINK) $(bjc_unprint_OBJECTS) $(bjc_unprint_LDADD) $(LIBS)
 curve$(EXEEXT): $(curve_OBJECTS) $(curve_DEPENDENCIES) 
 	@rm -f curve$(EXEEXT)
-	$(LINK) $(curve_LDFLAGS) $(curve_OBJECTS) $(curve_LDADD) $(LIBS)
+	$(LINK) $(curve_OBJECTS) $(curve_LDADD) $(LIBS)
 escp2-weavetest$(EXEEXT): $(escp2_weavetest_OBJECTS) $(escp2_weavetest_DEPENDENCIES) 
 	@rm -f escp2-weavetest$(EXEEXT)
-	$(LINK) $(escp2_weavetest_LDFLAGS) $(escp2_weavetest_OBJECTS) $(escp2_weavetest_LDADD) $(LIBS)
+	$(LINK) $(escp2_weavetest_OBJECTS) $(escp2_weavetest_LDADD) $(LIBS)
 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)
+	$(LINK) $(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)
+	$(LINK) $(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)
+	$(LINK) $(testdither_OBJECTS) $(testdither_LDADD) $(LIBS)
 unprint$(EXEEXT): $(unprint_OBJECTS) $(unprint_DEPENDENCIES) 
 	@rm -f unprint$(EXEEXT)
-	$(LINK) $(unprint_LDFLAGS) $(unprint_OBJECTS) $(unprint_LDADD) $(LIBS)
+	$(LINK) $(unprint_OBJECTS) $(unprint_LDADD) $(LIBS)
 xml-curve$(EXEEXT): $(xml_curve_OBJECTS) $(xml_curve_DEPENDENCIES) 
 	@rm -f xml-curve$(EXEEXT)
-	$(LINK) $(xml_curve_LDFLAGS) $(xml_curve_OBJECTS) $(xml_curve_LDADD) $(LIBS)
+	$(LINK) $(xml_curve_OBJECTS) $(xml_curve_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -480,22 +435,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml-curve.Po@am__quote@
 
 .c.o:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @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:
-@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
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @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 $@ $<
@@ -506,10 +461,6 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -559,9 +510,9 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -570,7 +521,7 @@ check-TESTS: $(TESTS)
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -582,7 +533,7 @@ check-TESTS: $(TESTS)
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -632,23 +583,21 @@ check-TESTS: $(TESTS)
 	else :; fi
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -699,7 +648,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -713,12 +662,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -739,19 +696,23 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	tags uninstall uninstall-am
 
 
 @SET_MAKE@
diff --git a/test/pixma_parse.c b/test/pixma_parse.c
index b32cec0..702cb84 100644
--- a/test/pixma_parse.c
+++ b/test/pixma_parse.c
@@ -124,7 +124,7 @@ static int eight2ten(unsigned char* inbuffer,unsigned char* outbuffer,int num_by
 
 
 /* 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){
+static int Raster(image_t* img,unsigned char* buffer,unsigned int len,unsigned char color_name,unsigned int maxw){
 	color_t* color=get_color(img,color_name);
         char* buf = (char*)buffer;
 	int size=0; /* size of unpacked buffer */
@@ -163,8 +163,12 @@ static int Raster(image_t* img,unsigned char* buffer,unsigned int len,unsigned c
 				}
 			}
 			/* adjust the maximum image width */
-			if(color && img->width < size*8/color->bpp)
-				img->width = size *8/color->bpp;
+			if(color && img->width < size*8/color->bpp){
+				unsigned int newwidth = size * 8 / color->bpp;
+				if(maxw && newwidth > maxw)
+					newwidth = maxw;
+				img->width = newwidth;
+			}
 			/* reset output buffer */
 			size=0;
 			dst=dstr;
@@ -339,7 +343,7 @@ static unsigned int read_uint32(unsigned char* a){
 
 
 /* process a printjob command by command */
-static int process(FILE* in, FILE* out,int verbose,unsigned int maxh){
+static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned int maxh){
 	image_t* img=calloc(1,sizeof(image_t));
 	unsigned char* buf=malloc(0xFFFF);
 	int returnv=0;
@@ -509,7 +513,7 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxh){
 			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])))
+				if((returnv = Raster(img,buf,cnt,img->color_order[img->cur_color],maxw)))
 					break;
 				++img->cur_color;
 				if(img->cur_color >= img->num_colors){
@@ -534,7 +538,7 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxh){
 				 * the selected color is stored in the first byte
 				 */
 				buf[cnt]=0x80;
-				returnv = Raster(img,buf+1,cnt,buf[0]);
+				returnv = Raster(img,buf+1,cnt,buf[0],maxw);
 				if (fgetc(in)!=0x0d){
 					printf("Raster A not terminated by 0x0d\n");
 					returnv=-4;
@@ -602,6 +606,7 @@ static void display_usage(void){
 	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(" -x width: cut the output ppm to the given width\n");
 	printf(" -y height: cut the output ppm to the given height\n");
 	printf(" -h: display this help\n");
 }
@@ -611,6 +616,7 @@ static void display_usage(void){
 int main(int argc,char* argv[]){
 	int verbose = 0;
 	unsigned int maxh=0;
+	unsigned int maxw=0;
 	char* filename_in=NULL,*filename_out=NULL;
 	FILE *in,*out=NULL;
 	int i;
@@ -632,6 +638,14 @@ int main(int argc,char* argv[]){
 					display_usage();
 					return 1;
 				}
+			}else if(argv[i][1] == 'x'){
+				if(argc > i+1){
+					++i;
+					maxw = atoi(argv[i]);
+				}else{
+					display_usage();
+					return 1;
+				}
 			}else {
 				printf("unknown parameter %s\n",argv[i]);
 				return 1;
@@ -664,7 +678,7 @@ int main(int argc,char* argv[]){
 	}
 	
 	/* process the printjob */
-	process(in,out,verbose,maxh);
+	process(in,out,verbose,maxw,maxh);
 
 	/* cleanup */
 	fclose(in);
diff --git a/test/run-testdither b/test/run-testdither
index 9f592c2..eb24b6c 100755
--- a/test/run-testdither
+++ b/test/run-testdither
@@ -35,8 +35,8 @@ set_args() {
 set_args `getopt hgvqncV "$@"`
 
 case "$valcount" in
-    1) valopts="$valopts -q --num-callers=100 --leak-check=yes";;
-    2) valopts="$valopts --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes" ;;
+    1) valopts="$valopts -q --num-callers=100 --error-limit=no --leak-check=yes";;
+    2) valopts="$valopts --num-callers=100 --error-limit=no --leak-resolution=high --leak-check=yes" ;;
     3) valopts="$valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes" ;;
     *) ;;
 esac